diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index ec53e80f038e..d959cbb4c035 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -1,3 +1,3 @@
 DIST sysstat-10.2.0.tar.bz2 307186 SHA256 8e494c30a2e5c4f11d6398b39df297a732fa3d4e3f5d5aa086044fccfe77f6d2 SHA512 6bc8b1217402845a4236c5ffc18f024700fa08e179b558eb65e23a7b95e1d1f1c45c2da6c323e59e74c938903fa0a6820997091d4e84a811fad7cb715dc25320 WHIRLPOOL 61097f59757032c03445410985d8fc98f5feef83d417e8bf666c56728517796c8007869b6328feabcb9fff3024b990fff7fcb4f045215f4614584f08c0db006d
 DIST sysstat-10.2.1.tar.bz2 309194 SHA256 998f6e75aeb1b64d5ce6ccd3b398318c84a816a96ca3950d29aea8b38e414ea7 SHA512 6e57e4e923285a51367fa4d2ce673cf0a6999fd78c95dfb2f895f3dc36df34bf06a01a11832b31224b4d90461f3b819451ee17866d4ecf9c3b28abd683970162 WHIRLPOOL 274e849135a7f60439c6d4f834b5b3443c577deb5cc73010d3b799e17f6458ae646fec9c1985d0544bc2938919fd1942473a54a05a75c81c3cab27c4ddd1477e
-DIST sysstat-10.3.1.tar.bz2 315023 SHA256 270e5464d1b741c1b3026e690a649255d6b91119f469f4c15efe16f37d73a8bd SHA512 50a859cb47b8f9dd6902583626789595548cbe4c7e4ec5eb6b4d9c40b7686ab2ea6cc055a0f62006fb29b1cbeabe5d64101d79c3a4771686fbc95b521689bbb7 WHIRLPOOL e0bfaf0fe13d1504e9e8ca947a673c2fb9ef1a3ee69d11b78285b598e6418b3508f116fb7a0fd0cac56168427be10df85c24557b95baa7c473594f0796733a9f
+DIST sysstat-11.0.0.tar.bz2 325498 SHA256 30f3833e469f0d4fc29be8e515979361ca9410524f51e16b496e83d7dde69e19 SHA512 f98204ad5f2cb21b55d7dc5a582b2bc4a003ea95b3029c5259e4d7337c802df551df599748fbe622cf190b021769747981675cb8e0c8f58f6cc285192d68e6da WHIRLPOOL d8bfdea94fdb08d5da7052b37af5ff483de970b310cb0e8c91a0233d3c26d31b5c183423bf5e09cce83b9b2ecd26f523178bd3d1de76787b47662892f8816f40
diff --git a/app-admin/sysstat/sysstat-10.3.1.ebuild b/app-admin/sysstat/sysstat-11.0.0.ebuild
similarity index 89%
rename from app-admin/sysstat/sysstat-10.3.1.ebuild
rename to app-admin/sysstat/sysstat-11.0.0.ebuild
index e3ffa1e0f45c..4a65693fd93a 100644
--- a/app-admin/sysstat/sysstat-10.3.1.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.3.1.ebuild,v 1.2 2014/05/17 15:08:44 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.0.ebuild,v 1.1 2014/06/23 20:43:15 jer Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="cron debug +doc isag nls lm_sensors selinux"
 
 RDEPEND="
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index 914a57d2959b..453cdab6fb88 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -1 +1,2 @@
 DIST amanda-3.3.3.tar.gz 4394935 SHA256 c36c9cd61dc62a7824abb7ba74cc4b09527bd82a930d691cf207b60b4bb15b72 SHA512 42af74a9e3b3fd92600e78d98eb4cdcf9d260bd9bbd016dde4133db346374deb41e4893159205336b35521c36f737c2877fd5030028531e1c09a0a6ac2931ba9 WHIRLPOOL 730deda1d85e645e658500a01ea72895f836a3dd99209314a65161674da24fed5aad98313a8ef66ef76176c6c7b1a60e62d30d692cfe2121eb429d9cb37f5636
+DIST amanda-3.3.5.tar.gz 4530463 SHA256 17d14cdc64e5b98270a2ad6c1b58a5e317ab2fe0d518a4212f82f7e3d13d231b SHA512 bef1f5271939e804387424924e6423537efa3ac1a722fe68f3afd77677e5974d8325f1a32a2a22d510344ee3d7b8f480a969611388fcb632c0f3cd640315f812 WHIRLPOOL 5ba8c2734cbd3a7e771b9fc7f9561596e5cda3dce1ea60b7192893fcca401e1c5da6154dcac18084ce6ef5ccacdf4899a65e255424f1bbbdafc219e8405669e4
diff --git a/app-backup/amanda/amanda-3.3.3-r1.ebuild b/app-backup/amanda/amanda-3.3.3-r1.ebuild
index b090487196ca..bb3f4b72ba89 100644
--- a/app-backup/amanda/amanda-3.3.3-r1.ebuild
+++ b/app-backup/amanda/amanda-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 1.7 2014/05/21 12:07:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3-r1.ebuild,v 1.8 2014/06/23 15:49:43 robbat2 Exp $
 
 EAPI=5
 inherit autotools eutils perl-module user systemd
@@ -25,7 +25,6 @@ RDEPEND="sys-libs/readline
 	kerberos? ( app-crypt/mit-krb5 )
 	xfs? ( sys-fs/xfsdump )
 	readline? ( sys-libs/readline )
-	!systemd? ( virtual/inetd )
 	!minimal? (
 		dev-perl/XML-Simple
 		virtual/mailx
@@ -450,6 +449,11 @@ pkg_postinst() {
 	elog "If you use localhost in your disklist your restores may break."
 	elog "You should replace it with the actual hostname!"
 	elog "Please also see the syntax changes to amandahosts."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+
 }
 
 # We have had reports of amanda file permissions getting screwed up.
diff --git a/app-backup/amanda/amanda-3.3.3.ebuild b/app-backup/amanda/amanda-3.3.3.ebuild
index 37d85f8fb918..53ffeada682d 100644
--- a/app-backup/amanda/amanda-3.3.3.ebuild
+++ b/app-backup/amanda/amanda-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.10 2014/05/21 12:07:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.11 2014/06/23 15:49:43 robbat2 Exp $
 
 EAPI=5
 inherit autotools eutils perl-module user systemd
@@ -25,7 +25,6 @@ RDEPEND="sys-libs/readline
 	kerberos? ( app-crypt/mit-krb5 )
 	xfs? ( sys-fs/xfsdump )
 	readline? ( sys-libs/readline )
-	!systemd? ( virtual/inetd )
 	!minimal? (
 		dev-perl/XML-Simple
 		virtual/mailx
@@ -447,6 +446,11 @@ pkg_postinst() {
 	elog "If you use localhost in your disklist your restores may break."
 	elog "You should replace it with the actual hostname!"
 	elog "Please also see the syntax changes to amandahosts."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+
 }
 
 # We have had reports of amanda file permissions getting screwed up.
diff --git a/app-backup/amanda/amanda-3.3.5.ebuild b/app-backup/amanda/amanda-3.3.5.ebuild
new file mode 100644
index 000000000000..6d93b32a092a
--- /dev/null
+++ b/app-backup/amanda/amanda-3.3.5.ebuild
@@ -0,0 +1,472 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.5.ebuild,v 1.1 2014/06/23 15:49:43 robbat2 Exp $
+
+EAPI=5
+inherit autotools eutils perl-module user systemd
+
+DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
+HOMEPAGE="http://www.amanda.org/"
+SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
+LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RDEPEND="sys-libs/readline
+	virtual/awk
+	app-arch/tar
+	>=dev-lang/perl-5.6
+	app-arch/dump
+	net-misc/openssh
+	>=dev-libs/glib-2.26.0
+	nls? ( virtual/libintl )
+	s3? ( >=net-misc/curl-7.10.0 )
+	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
+	samba? ( net-fs/samba )
+	kerberos? ( app-crypt/mit-krb5 )
+	xfs? ( sys-fs/xfsdump )
+	readline? ( sys-libs/readline )
+	!minimal? (
+		dev-perl/XML-Simple
+		virtual/mailx
+		app-arch/mt-st
+		sys-block/mtx
+		gnuplot? ( sci-visualization/gnuplot )
+		app-crypt/aespipe
+		app-crypt/gnupg
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	>=app-text/docbook-xsl-stylesheets-1.72.0
+	app-text/docbook-xml-dtd
+	dev-libs/libxslt
+	"
+
+IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
+
+MYFILESDIR="${T}/files"
+ENVDIR="/etc/env.d"
+ENVDFILE="97amanda"
+TMPENVFILE="${T}/${ENVDFILE}"
+
+# This is a complete list of Amanda settings that the ebuild takes from the
+# build environment. This allows users to alter the behavior of the package as
+# upstream intended, but keeping with Gentoo style. We store a copy of them in
+# /etc/env.d/97amanda during the install, so that they are preserved for future
+# installed. This variable name must not start with AMANDA_, as we do not want
+# it captured into the env file.
+ENV_SETTINGS_AMANDA="
+AMANDA_GROUP_GID AMANDA_GROUP_NAME
+AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
+AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
+AMANDA_TAR_LISTDIR AMANDA_TAR
+AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
+AMANDA_CONFIG_NAME AMANDA_TMPDIR"
+
+amanda_variable_setup() {
+
+	# Setting vars
+	local currentamanda
+
+	# Grab the current settings
+	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
+
+	# First we set the defaults
+	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
+	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
+	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
+	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
+	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
+	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
+	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
+
+	# This installs Amanda, with the server. However, it could be a client,
+	# just specify an alternate server name in AMANDA_SERVER.
+	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
+	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
+	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
+	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
+	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
+	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
+	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
+	# These are left empty by default
+	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
+	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
+	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
+	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
+
+	# What tar to use
+	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
+
+	# Now pull in the old stuff
+	if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
+		# We don't just source it as we don't want everything in there.
+		eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
+	fi
+
+	# Re-apply the new settings if any
+	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
+
+}
+
+pkg_setup() {
+	amanda_variable_setup
+
+	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
+	# another host than HOSTNAME.
+	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
+		elog "You are installing a client-only version of Amanda."
+		elog "You should set the variable \$AMANDA_SERVER to point at your"
+		elog "Amanda-tape-server, otherwise you will have to specify its name"
+		elog "when using amrecover on the client."
+		elog "For example: Use something like"
+		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
+		elog
+	fi
+
+	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
+	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
+}
+
+src_unpack() {
+	# we do not want the perl src_unpack
+	default_src_unpack
+}
+
+src_prepare() {
+
+	# gentoo bug #331111
+	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
+	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
+
+	# bug with glibc-2.16.0
+	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
+
+	eautoreconf
+
+	# places for us to work in
+	mkdir -p "${MYFILESDIR}"
+	# Now we store the settings we just created
+	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
+
+	# Prepare our custom files
+	einfo "Building custom configuration files"
+	local i # our iterator
+	local sedexpr # var for sed expr
+	sedexpr=''
+	for i in ${ENV_SETTINGS_AMANDA} ; do
+		local val
+		eval "val=\"\${${i}}\""
+		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
+	done
+
+	# now apply the sed expr
+	for i in "${FILESDIR}"/amanda-* ; do
+		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
+	done
+
+	(
+		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
+		use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
+	) > "${T}"/amandahosts
+
+	if ! use minimal; then
+		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
+			server-src/am{addclient,serverconfig}.pl || die
+	fi
+}
+
+src_configure() {
+	# fix bug #36316
+	addpredict /var/cache/samba/gencache.tdb
+	# fix bug #376169
+	addpredict /run/blkid
+	addpredict /etc/blkid.tab
+
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+	local myconf
+
+	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
+	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
+	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
+	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
+	einfo "Using ${AMANDA_USER_NAME} for amanda user."
+	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
+	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
+	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
+	einfo "Using ${AMANDA_TAR} as Tar implementation."
+	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
+	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
+	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
+	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
+	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
+	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
+	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
+
+	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
+		eerror "If you want _both_ UDP and TCP ports, please use only the"
+		eerror "AMANDA_PORTS environment variable for identical ports, or set"
+		eerror "AMANDA_PORTS_BOTH."
+		die "Bad port setup!"
+	fi
+	if [ -n "${AMANDA_PORTS_UDP}" ]; then
+		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
+		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
+	fi
+	if [ -n "${AMANDA_PORTS_TCP}" ]; then
+		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
+		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
+	fi
+	if [ -n "${AMANDA_PORTS}" ]; then
+		einfo "Using ports ${AMANDA_PORTS/,/-}"
+		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
+	fi
+
+	# Extras
+	# Speed option
+	myconf="${myconf} --with-buffered-dump"
+	# "debugging" in the configuration is NOT debug in the conventional sense.
+	# It is actually just useful output in the application, and should remain
+	# enabled. There are some cases of breakage with MTX tape changers as of
+	# 2.5.1p2 that it exposes when turned off as well.
+	myconf="${myconf} --with-debugging"
+	# Where to put our files
+	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
+
+	# Samba support
+	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
+
+	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
+	# default
+	myconf="${myconf} --with-bsd-security"
+	myconf="${myconf} --with-ssh-security"
+	myconf="${myconf} --with-bsdudp-security"
+	myconf="${myconf} --with-bsdtcp-security"
+
+	# kerberos-security mechanism version 5
+	myconf="${myconf} `use_with kerberos krb5-security`"
+
+	# Amazon S3 support
+	myconf="${myconf} `use_enable s3 s3-device`"
+
+	# libcurl is required for S3 but otherwise optional
+	if ! use s3; then
+		myconf="${myconf} $(use_with curl libcurl)"
+	fi
+
+	# Client only, as requested in bug #127725
+	if use minimal ; then
+		myconf="${myconf} --without-server"
+	else
+		# amplot
+		myconf="${myconf} $(use_with gnuplot)"
+	fi
+
+	# IPv6 fun.
+	myconf="${myconf} `use_with ipv6`"
+	# This is to prevent the IPv6-is-working test
+	# As the test fails on binpkg build hosts with no IPv6.
+	use ipv6 && export amanda_cv_working_ipv6=yes
+
+	# I18N
+	myconf="${myconf} `use_enable nls`"
+
+	# Bug #296634: Perl location
+	perlinfo
+	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
+
+	# Bug 296633: --disable-syntax-checks
+	# Some tests are not safe for production systems
+	myconf="${myconf} --disable-syntax-checks"
+
+	# build manpages
+	myconf="${myconf} --enable-manpage-build"
+
+	# bug #483120
+	tc-export AR
+
+	econf \
+		$(use_with readline) \
+		${myconf}
+}
+
+src_compile() {
+	# Again, do not want the perl-module src_compile
+	default_src_compile
+}
+
+src_install() {
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source ${TMPENVFILE}
+
+	einfo "Doing stock install"
+	emake DESTDIR="${D}" install || die
+
+	# Build the envdir file
+	# Don't forget this..
+	einfo "Building environment file"
+	(
+		echo "# These settings are what was present in the environment when this"
+		echo "# Amanda was compiled.  Changing anything below this comment will"
+		echo "# have no effect on your application, but it merely exists to"
+		echo "# preserve them for your next emerge of Amanda"
+		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
+	) >> "${MYFILESDIR}/${ENVDFILE}"
+
+	# Env.d
+	einfo "Installing environment config file"
+	doenvd "${MYFILESDIR}/${ENVDFILE}"
+
+	# Lock down next section (up until docs).
+	insopts -m0640
+	# Installing Amanda Xinetd Services Definition
+	einfo "Installing xinetd service file"
+	insinto /etc/xinetd.d
+	if use minimal ; then
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
+	else
+		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
+	fi
+
+	if ! use minimal; then
+		einfo "Installing Sample Daily Cron Job for Amanda"
+		insinto /etc/cron.daily
+		newins "${MYFILESDIR}/amanda-cron" amanda
+	fi
+
+	einfo "Installing systemd service and socket files for Amanda"
+	systemd_dounit "${FILESDIR}"/amanda.socket || die
+	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
+
+	insinto /etc/amanda
+	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
+	doins "${T}/amandahosts"
+	fperms 600 /etc/amanda/amandahosts
+
+	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
+	insinto "${AMANDA_USER_HOMEDIR}"
+	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
+	newins "${MYFILESDIR}/amanda-profile" .profile
+
+	insinto /etc/amanda
+	doins "${S}/example/amanda-client.conf"
+	if ! use minimal ; then
+		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
+		doins "${S}/example/amanda.conf"
+		doins "${S}/example/disklist"
+		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
+	fi
+
+	keepdir "${AMANDA_TAR_LISTDIR}"
+	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
+	keepdir "${AMANDA_TMPDIR}/dumps"
+	# Just make sure it exists for XFS to work...
+	use xfs && keepdir /var/xfsdump/inventory
+
+	local i
+	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" /etc/amanda; do
+		einfo "Securing directory (${i})"
+		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
+	done
+	# Do NOT use -R
+	fperms 0700 \
+		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
+		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
+		 "${AMANDA_USER_HOMEDIR}/amanda" \
+		 /etc/amanda
+
+	if ! use minimal ; then
+		fperms 0700 \
+			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
+	         /etc/amanda/${AMANDA_CONFIG_NAME}
+	fi
+
+	einfo "Setting setuid permissions"
+	amanda_permissions_fix "${D}"
+
+	# Relax permissions again
+	insopts -m0644
+
+	# docs
+	einfo "Installing documentation"
+	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
+	# our inetd sample
+	einfo "Installing standard inetd sample"
+	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
+	# Amanda example configs
+	einfo "Installing example configurations"
+	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
+	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
+	docinto example1
+	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
+	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
+	newdoc "${FILESDIR}/example_global.conf" global.conf
+
+	einfo "Cleaning up dud .la files"
+	perlinfo
+	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
+}
+
+pkg_postinst() {
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
+		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
+	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
+	source "${TMPENVFILE}"
+
+	# Migration of amandates from /etc to $localstatedir/amanda
+	if [ -f "${ROOT}/etc/amandates" -a \
+		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
+		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
+		einfo "A backup is also placed at /etc/amandates.orig"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
+		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
+		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
+	fi
+	if [ -f "${ROOT}/etc/amandates" ]; then
+		einfo "If you have migrated safely, please delete /etc/amandates"
+	fi
+
+	einfo "Checking setuid permissions"
+	amanda_permissions_fix "${ROOT}"
+
+	elog "You should configure Amanda in /etc/amanda now."
+	elog
+	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
+	elog "and restart xinetd afterwards!"
+	elog
+	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
+	elog "as an example of how to configure your inetd."
+	elog
+	elog "NOTICE: If you need raw access to partitions you need to add the"
+	elog "amanda user to the 'disk' group."
+	elog
+	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
+	elog "to the 'tape' group."
+	elog
+	elog "If you use localhost in your disklist your restores may break."
+	elog "You should replace it with the actual hostname!"
+	elog "Please also see the syntax changes to amandahosts."
+	elog
+	elog "Please note that this package no longer explicitly depends on"
+	elog "virtual/inetd, as it supports modes where an inetd is not needed"
+	elog "(see bug #506028 for details)."
+
+}
+
+# We have had reports of amanda file permissions getting screwed up.
+# Losing setuid, becoming too lax etc.
+# ONLY root and users in the amanda group should be able to run these binaries!
+amanda_permissions_fix() {
+	local root="$1"
+	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
+	local le="/usr/libexec/amanda"
+	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
+		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
+		"${le}"/planner ; do
+		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
+		chmod u=srwx,g=rx,o= "${root}"/${i}
+	done
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 269fec41d47d..bfd1b9f5bd8b 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,3 +1,4 @@
 DIST gnupg-1.4.16.tar.bz2 3656752 SHA256 7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f SHA512 62bccf22211c25cf2ffbf9d35b8f47211e3a71fd92828705d12b23e7d658c9c65c6d845eb5e887e0d855d90a49a5033ecf9de4e22a63e7d3fc052eb1ed33dff4 WHIRLPOOL 7b84449fe7e49e7009d30cdfb8e4b7e1067e3d4bddf94cfa9fca6b3fcfccaa4cd1bd86c3e08507a7f9f1080feb3057b7db1ddcbbaabf42a4fc84d0c36bc91d70
+DIST gnupg-1.4.17.tar.bz2 3648762 SHA256 e6dd9d19d62dc434d354076d1f7cea11e87934ff2a0912aa806f848dda0a7b5b SHA512 9a3827182d71557b9909de7c0939518c869e491874dd8120e991cb243ef79c4dd6275e4b77c4d23f124bb2a732cd1ec3357261f579e94c15f71e9afb03f2e19c WHIRLPOOL 2f93d0c16706590b85b5ed66b520e72df825af8d483a68c72ef6ae12a8979c27a9cd682332243514a235b11a28dc08e21d632cc212b34e5107071d2fc0506bf5
 DIST gnupg-2.0.22.tar.bz2 4277117 SHA256 437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251 SHA512 de534b2f4b8d3c320e97519fe0834bc403c96c6dbb2e24fc24eb68f4ff80374360ef66d83ddc3d6fa096c5199d3782abc5d06b866203378cba130b42802cc855 WHIRLPOOL c45e7b2560ae31f013f732863db99f6e23d0de83d03371fe592192c2b5f800503f7a1e273c59e4c99f3aa0401e8cfb2bdbf1c5029534f642305e768009f15fef
 DIST gnupg-2.0.23.tar.bz2 4297195 SHA256 cf196b8056eafb4236f000a3e12543e0022a1fec4d6edff1b91b48936c109841 SHA512 5982b25a470b8e6c2874cfadbd2da7db7fb219b5a0be254d73772488b47e2fa1b3825c6640c3659e27905d56d53eaffd34728540081ff160bffea80678d37847 WHIRLPOOL 95184a59be90de483be82b064e8222be0957b0d17466ba80de5b6d8cd8774ca9a3fd83ac967437e4b296905f06ca0f0b2e446fa905ef5871ab1492c7db7e1b3b
diff --git a/app-crypt/gnupg/gnupg-1.4.17.ebuild b/app-crypt/gnupg/gnupg-1.4.17.ebuild
new file mode 100644
index 000000000000..0cf057d94632
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-1.4.17.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.17.ebuild,v 1.1 2014/06/23 17:50:24 alonbl Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+ECCVER="0.2.0"
+ECCVER_GNUPG="1.4.9"
+ECC_PATCH="${PN}-${ECCVER_GNUPG}-ecc${ECCVER}.diff"
+MY_P=${P/_/}
+
+DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
+
+COMMON_DEPEND="
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	curl? ( net-misc/curl )
+	mta? ( virtual/mta )
+	readline? ( sys-libs/readline )
+	smartcard? ( =virtual/libusb-0* )
+	usb? ( =virtual/libusb-0* )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND} )
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Install RU man page in right location
+	sed -e "/^man_MANS =/s/ gpg\.ru\.1//" -i doc/Makefile.in || die "sed doc/Makefile.in failed"
+
+	# bug#469388
+	sed -i -e 's/--batch --dearmor/--homedir . --batch --dearmor/' checks/Makefile.in
+
+	# Fix PIC definitions
+	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c \
+		|| die "sed PIC failed"
+	sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S || \
+		die "sed PIC failed"
+}
+
+src_configure() {
+	# Certain sparc32 machines seem to have trouble building correctly with
+	# -mcpu enabled.  While this is not a gnupg problem, it is a temporary
+	# fix until the gcc problem can be tracked down.
+	if [ "${ARCH}" == "sparc" ] && [ "${PROFILE_ARCH}" == "sparc" ]; then
+		filter-flags -mcpu=supersparc -mcpu=v8 -mcpu=v7
+	fi
+
+	# 'USE=static' support was requested in #29299
+	use static && append-ldflags -static
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable ldap) \
+		$(use_enable mta mailto) \
+		--enable-hkp \
+		--enable-finger \
+		$(use_with !zlib included-zlib) \
+		$(use_with curl libcurl /usr) \
+		$(use_enable nls) \
+		$(use_enable bzip2) \
+		$(use_enable smartcard card-support) \
+		$(use_enable selinux selinux-support) \
+		--without-capabilities \
+		$(use_with readline) \
+		$(use_with usb libusb /usr) \
+		--enable-static-rnd=linux \
+		--libexecdir="${EPREFIX}/usr/libexec" \
+		--enable-noexecstack \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	# keep the documentation in /usr/share/doc/...
+	rm -rf "${ED}usr/share/gnupg/FAQ" "${ED}usr/share/gnupg/faq.html" || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS PROJECTS README THANKS \
+		TODO VERSION doc/{FAQ,HACKING,DETAILS,OpenPGP}
+
+	exeinto /usr/libexec/gnupg
+	doexe tools/make-dns-cert
+
+	# install RU documentation in right location
+	if use linguas_ru; then
+		cp doc/gpg.ru.1 "${T}/gpg.1" || die
+		doman -i18n=ru "${T}/gpg.1"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If you are using a non-Linux system, or a kernel older than 2.6.9,"
+	ewarn "you MUST make the gpg binary setuid."
+	echo
+#	if use !bindist && use ecc; then
+#		ewarn
+#		ewarn "The elliptical curves patch is experimental"
+#		ewarn "Further info available at http://alumnes.eps.udl.es/%7Ed4372211/index.en.html"
+#	fi
+	elog
+	elog "See http://www.gentoo.org/doc/en/gnupg-user.xml for documentation on gnupg"
+	elog
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate the right viewer"
+}
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 9b5748a533d2..aa2a86af2888 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,2 +1,2 @@
-DIST free42-1.4.75.tgz 6535975 SHA256 a7df69c83ef26bbacdc2c9f912639b9f84f181fea5626a5f12efdefa58185675 SHA512 c075057b6c10b3091845c0448a4ec7fa591b81471b636accad82e662d0706c922496acc54048b781ed748e998c9f1138b614ddef477a78fab778ff01addf89b9 WHIRLPOOL cde04bbbb2ea467a3819729782c5df0580dc48fa7557f2a5f23233df6e38814008f05abef89a3afe336ea60c208de923edaa30bfb41717f213e2eb264464ec2b
 DIST free42-1.4.77.tgz 1096936 SHA256 b500b90eeee486af297a0b04a4ee611d36a41f99f5a5b71ed2d98ce9831addc5 SHA512 ab2ed1703ce5210c904bd5eda8c416a30588a80b18648fadb16c01ef7c5487a71851cf238e0130402d2536a3068d6ee3eb585e60d99479ca0e1ca5a8ea968651 WHIRLPOOL 2bfd040c82d59a5af0b2391d81756332d9f606d7200239d3d4e06d4e2e8b09b1480b1f76facdafb26056151ac0c654d93068c60071760fc69f72efea03f58659
+DIST free42-1.5.3a.tgz 8150063 SHA256 3212a32fc7958ed2d53452adf2301c4747b4774154a4ecaceb478b67d31bfce6 SHA512 61f07f8899aac7619d5d9bbeca224f3e06feb9b548adacebf207e1e1e139fd5b4f30f7c11ca5956bb2f71221ea46c15028d6116d67b9130204288cda603b1c5c WHIRLPOOL 45310aa0b16680f5569fc90b65b21264d7b0e2d8fafab0935fb8e6e2170f4a30080eb9eb6f9561e853dca290a49f8668007d005c5cdafd61d1dc5436506abfab
diff --git a/app-emulation/free42/files/free42-1.4.75-fix-alsa.patch b/app-emulation/free42/files/free42-1.4.75-fix-alsa.patch
deleted file mode 100644
index 0994d083d628..000000000000
--- a/app-emulation/free42/files/free42-1.4.75-fix-alsa.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -Nur a/gtk/audio_alsa.cc b/gtk/audio_alsa.cc
---- a/gtk/audio_alsa.cc	2012-10-27 21:14:48.000000000 +0200
-+++ b/gtk/audio_alsa.cc	2012-11-13 22:11:41.489906248 +0100
-@@ -23,39 +23,94 @@
- #include <sys/time.h>
- #include <pthread.h>
- #include <dlfcn.h>
-+#include <math.h>
- 
- // We want to be able to run even if libasound is not present, so we have to
- // link it manually using dlopen() and dlsym(). These are the functions we are
- // going to need; the pointer names are the same as the actual function names
- // in libasound, with _dl_ prefixed.
- static int libasound_state = 0; // 0=closed, 1=open, 2=missing
--static int (*_dl_snd_pcm_close)(snd_pcm_t *pcm);
--static int (*_dl_snd_pcm_format_big_endian)(snd_pcm_format_t format);
--static int (*_dl_snd_pcm_format_physical_width)(snd_pcm_format_t format);
--static int (*_dl_snd_pcm_format_unsigned)(snd_pcm_format_t format);
--static int (*_dl_snd_pcm_format_width)(snd_pcm_format_t format);
--static int (*_dl_snd_pcm_hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
--static int (*_dl_snd_pcm_hw_params_malloc)(snd_pcm_hw_params_t **ptr);
--static void (*_dl_snd_pcm_hw_params_free)(snd_pcm_hw_params_t *obj);
--static int (*_dl_snd_pcm_hw_params_any)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
--static int (*_dl_snd_pcm_hw_params_get_buffer_size)(const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
--static int (*_dl_snd_pcm_hw_params_set_access)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
--static int (*_dl_snd_pcm_hw_params_set_buffer_size_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
--static int (*_dl_snd_pcm_hw_params_set_channels)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
--static int (*_dl_snd_pcm_hw_params_set_format)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
--static int (*_dl_snd_pcm_hw_params_set_rate_near)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
--static int (*_dl_snd_pcm_open)(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
--static int (*_dl_snd_pcm_prepare)(snd_pcm_t *pcm);
--static int (*_dl_snd_pcm_resume)(snd_pcm_t *pcm);
--static int (*_dl_snd_pcm_sw_params)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
--static int (*_dl_snd_pcm_sw_params_malloc)(snd_pcm_sw_params_t **ptr);
--static void (*_dl_snd_pcm_sw_params_free)(snd_pcm_sw_params_t *obj);
--static int (*_dl_snd_pcm_sw_params_current)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
--static int (*_dl_snd_pcm_sw_params_get_boundary)(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val);
--static int (*_dl_snd_pcm_sw_params_set_silence_size)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
--static int (*_dl_snd_pcm_sw_params_set_silence_threshold)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
--static snd_pcm_sframes_t (*_dl_snd_pcm_writei)(snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
--static const char *(*_dl_snd_strerror)(int errnum);
-+
-+typedef int (dyn_snd_pcm_close) (snd_pcm_t *pcm);
-+dyn_snd_pcm_close * _dl_snd_pcm_close = NULL;
-+
-+typedef int (dyn_snd_pcm_format_big_endian) (snd_pcm_format_t format);
-+dyn_snd_pcm_format_big_endian * _dl_snd_pcm_format_big_endian = NULL;
-+
-+typedef int (dyn_snd_pcm_format_physical_width) (snd_pcm_format_t format);
-+dyn_snd_pcm_format_physical_width * _dl_snd_pcm_format_physical_width = NULL;
-+
-+typedef int (dyn_snd_pcm_format_unsigned) (snd_pcm_format_t format);
-+dyn_snd_pcm_format_unsigned * _dl_snd_pcm_format_unsigned = NULL;
-+
-+typedef int (dyn_snd_pcm_format_width) (snd_pcm_format_t format);
-+dyn_snd_pcm_format_width * _dl_snd_pcm_format_width = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
-+dyn_snd_pcm_hw_params * _dl_snd_pcm_hw_params = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_malloc) (snd_pcm_hw_params_t **ptr);
-+dyn_snd_pcm_hw_params_malloc * _dl_snd_pcm_hw_params_malloc = NULL;
-+
-+typedef void (dyn_snd_pcm_hw_params_free) (snd_pcm_hw_params_t *obj);
-+dyn_snd_pcm_hw_params_free * _dl_snd_pcm_hw_params_free = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_any) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
-+dyn_snd_pcm_hw_params_any * _dl_snd_pcm_hw_params_any = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_get_buffer_size) (const snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
-+dyn_snd_pcm_hw_params_get_buffer_size * _dl_snd_pcm_hw_params_get_buffer_size = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_set_access) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access);
-+dyn_snd_pcm_hw_params_set_access * _dl_snd_pcm_hw_params_set_access = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_set_buffer_size_near) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_uframes_t *val);
-+dyn_snd_pcm_hw_params_set_buffer_size_near * _dl_snd_pcm_hw_params_set_buffer_size_near = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_set_channels) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int val);
-+dyn_snd_pcm_hw_params_set_channels * _dl_snd_pcm_hw_params_set_channels = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_set_format) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_format_t val);
-+dyn_snd_pcm_hw_params_set_format * _dl_snd_pcm_hw_params_set_format = NULL;
-+
-+typedef int (dyn_snd_pcm_hw_params_set_rate_near) (snd_pcm_t *pcm, snd_pcm_hw_params_t *params, unsigned int *val, int *dir);
-+dyn_snd_pcm_hw_params_set_rate_near * _dl_snd_pcm_hw_params_set_rate_near = NULL;
-+
-+typedef int (dyn_snd_pcm_open) (snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode);
-+dyn_snd_pcm_open * _dl_snd_pcm_open = NULL;
-+
-+typedef int (dyn_snd_pcm_prepare) (snd_pcm_t *pcm);
-+dyn_snd_pcm_prepare * _dl_snd_pcm_prepare = NULL;
-+
-+typedef int (dyn_snd_pcm_resume) (snd_pcm_t *pcm);
-+dyn_snd_pcm_resume * _dl_snd_pcm_resume = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params) (snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-+dyn_snd_pcm_sw_params * _dl_snd_pcm_sw_params = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params_malloc) (snd_pcm_sw_params_t **ptr);
-+dyn_snd_pcm_sw_params_malloc * _dl_snd_pcm_sw_params_malloc = NULL;
-+
-+typedef void (dyn_snd_pcm_sw_params_free) (snd_pcm_sw_params_t *obj);
-+dyn_snd_pcm_sw_params_free * _dl_snd_pcm_sw_params_free = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params_current) (snd_pcm_t *pcm, snd_pcm_sw_params_t *params);
-+dyn_snd_pcm_sw_params_current * _dl_snd_pcm_sw_params_current = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params_get_boundary) (const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val);
-+dyn_snd_pcm_sw_params_get_boundary * _dl_snd_pcm_sw_params_get_boundary = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params_set_silence_size) (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
-+dyn_snd_pcm_sw_params_set_silence_size * _dl_snd_pcm_sw_params_set_silence_size = NULL;
-+
-+typedef int (dyn_snd_pcm_sw_params_set_silence_threshold) (snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_uframes_t val);
-+dyn_snd_pcm_sw_params_set_silence_threshold * _dl_snd_pcm_sw_params_set_silence_threshold = NULL;
-+
-+typedef snd_pcm_sframes_t (dyn_snd_pcm_writei) (snd_pcm_t *pcm, const void *buffer, snd_pcm_uframes_t size);
-+dyn_snd_pcm_writei * _dl_snd_pcm_writei = NULL;
-+
-+typedef const char * (dyn_snd_strerror) (int errnum);
-+dyn_snd_strerror * _dl_snd_strerror = NULL;
- 
- #define TDIFF(begin,end) (((double)(end.tv_sec - begin.tv_sec)*1000.0) + ((end.tv_usec - begin.tv_usec)/1000.0))
- 
-@@ -169,33 +224,34 @@
- 	fprintf(stderr, "Could not open " ALSALIB "\nusing gdk_beep() for BEEP and TONE.\n");
- 	return false;
-     }
--    *((void **) &_dl_snd_pcm_close) = dlsym(lib, "snd_pcm_close");
--    *((void **) &_dl_snd_pcm_format_big_endian) = dlsym(lib, "snd_pcm_format_big_endian");
--    *((void **) &_dl_snd_pcm_format_physical_width) = dlsym(lib, "snd_pcm_format_physical_width");
--    *((void **) &_dl_snd_pcm_format_unsigned) = dlsym(lib, "snd_pcm_format_unsigned");
--    *((void **) &_dl_snd_pcm_format_width) = dlsym(lib, "snd_pcm_format_width");
--    *((void **) &_dl_snd_pcm_hw_params) = dlsym(lib, "snd_pcm_hw_params");
--    *((void **) &_dl_snd_pcm_hw_params_malloc) = dlsym(lib, "snd_pcm_hw_params_malloc");
--    *((void **) &_dl_snd_pcm_hw_params_free) = dlsym(lib, "snd_pcm_hw_params_free");
--    *((void **) &_dl_snd_pcm_hw_params_any) = dlsym(lib, "snd_pcm_hw_params_any");
--    *((void **) &_dl_snd_pcm_hw_params_get_buffer_size) = dlsym(lib, "snd_pcm_hw_params_get_buffer_size");
--    *((void **) &_dl_snd_pcm_hw_params_set_access) = dlsym(lib, "snd_pcm_hw_params_set_access");
--    *((void **) &_dl_snd_pcm_hw_params_set_buffer_size_near) = dlsym(lib, "snd_pcm_hw_params_set_buffer_size_near");
--    *((void **) &_dl_snd_pcm_hw_params_set_channels) = dlsym(lib, "snd_pcm_hw_params_set_channels");
--    *((void **) &_dl_snd_pcm_hw_params_set_format) = dlsym(lib, "snd_pcm_hw_params_set_format");
--    *((void **) &_dl_snd_pcm_hw_params_set_rate_near) = dlsym(lib, "snd_pcm_hw_params_set_rate_near");
--    *((void **) &_dl_snd_pcm_open) = dlsym(lib, "snd_pcm_open");
--    *((void **) &_dl_snd_pcm_prepare) = dlsym(lib, "snd_pcm_prepare");
--    *((void **) &_dl_snd_pcm_resume) = dlsym(lib, "snd_pcm_resume");
--    *((void **) &_dl_snd_pcm_sw_params) = dlsym(lib, "snd_pcm_sw_params");
--    *((void **) &_dl_snd_pcm_sw_params_malloc) = dlsym(lib, "snd_pcm_sw_params_malloc");
--    *((void **) &_dl_snd_pcm_sw_params_free) = dlsym(lib, "snd_pcm_sw_params_free");
--    *((void **) &_dl_snd_pcm_sw_params_current) = dlsym(lib, "snd_pcm_sw_params_current");
--    *((void **) &_dl_snd_pcm_sw_params_get_boundary) = dlsym(lib, "snd_pcm_sw_params_get_boundary");
--    *((void **) &_dl_snd_pcm_sw_params_set_silence_size) = dlsym(lib, "snd_pcm_sw_params_set_silence_size");
--    *((void **) &_dl_snd_pcm_sw_params_set_silence_threshold) = dlsym(lib, "snd_pcm_sw_params_set_silence_threshold");
--    *((void **) &_dl_snd_pcm_writei) = dlsym(lib, "snd_pcm_writei");
--    *((void **) &_dl_snd_strerror) = dlsym(lib, "snd_strerror");
-+    _dl_snd_pcm_close = (dyn_snd_pcm_close *) dlsym(lib, "snd_pcm_close");
-+    _dl_snd_pcm_format_big_endian = (dyn_snd_pcm_format_big_endian *) dlsym(lib, "snd_pcm_format_big_endian");
-+    _dl_snd_pcm_format_physical_width = (dyn_snd_pcm_format_physical_width *) dlsym(lib, "snd_pcm_format_physical_width");
-+    _dl_snd_pcm_format_unsigned = (dyn_snd_pcm_format_unsigned *) dlsym(lib, "snd_pcm_format_unsigned");
-+    _dl_snd_pcm_format_width = (dyn_snd_pcm_format_width *) dlsym(lib, "snd_pcm_format_width");
-+    _dl_snd_pcm_hw_params = (dyn_snd_pcm_hw_params *) dlsym(lib, "snd_pcm_hw_params");
-+    _dl_snd_pcm_hw_params_malloc = (dyn_snd_pcm_hw_params_malloc *) dlsym(lib, "snd_pcm_hw_params_malloc");
-+    _dl_snd_pcm_hw_params_free = (dyn_snd_pcm_hw_params_free *) dlsym(lib, "snd_pcm_hw_params_free");
-+    _dl_snd_pcm_hw_params_any = (dyn_snd_pcm_hw_params_any *) dlsym(lib, "snd_pcm_hw_params_any");
-+    _dl_snd_pcm_hw_params_get_buffer_size = (dyn_snd_pcm_hw_params_get_buffer_size *) dlsym(lib, "snd_pcm_hw_params_get_buffer_size");
-+    _dl_snd_pcm_hw_params_set_access = (dyn_snd_pcm_hw_params_set_access *) dlsym(lib, "snd_pcm_hw_params_set_access");
-+    _dl_snd_pcm_hw_params_set_buffer_size_near = (dyn_snd_pcm_hw_params_set_buffer_size_near *) dlsym(lib, "snd_pcm_hw_params_set_buffer_size_near");
-+    _dl_snd_pcm_hw_params_set_channels = (dyn_snd_pcm_hw_params_set_channels *) dlsym(lib, "snd_pcm_hw_params_set_channels");
-+    _dl_snd_pcm_hw_params_set_format = (dyn_snd_pcm_hw_params_set_format *) dlsym(lib, "snd_pcm_hw_params_set_format");
-+    _dl_snd_pcm_hw_params_set_rate_near = (dyn_snd_pcm_hw_params_set_rate_near *) dlsym(lib, "snd_pcm_hw_params_set_rate_near");
-+    _dl_snd_pcm_open = (dyn_snd_pcm_open *) dlsym(lib, "snd_pcm_open");
-+    _dl_snd_pcm_prepare = (dyn_snd_pcm_prepare *) dlsym(lib, "snd_pcm_prepare");
-+    _dl_snd_pcm_resume = (dyn_snd_pcm_resume *) dlsym(lib, "snd_pcm_resume");
-+    _dl_snd_pcm_sw_params = (dyn_snd_pcm_sw_params *) dlsym(lib, "snd_pcm_sw_params");
-+    _dl_snd_pcm_sw_params_malloc = (dyn_snd_pcm_sw_params_malloc *) dlsym(lib, "snd_pcm_sw_params_malloc");
-+    _dl_snd_pcm_sw_params_free = (dyn_snd_pcm_sw_params_free *) dlsym(lib, "snd_pcm_sw_params_free");
-+    _dl_snd_pcm_sw_params_current = (dyn_snd_pcm_sw_params_current *) dlsym(lib, "snd_pcm_sw_params_current");
-+    _dl_snd_pcm_sw_params_get_boundary = (dyn_snd_pcm_sw_params_get_boundary *) dlsym(lib, "snd_pcm_sw_params_get_boundary");
-+    _dl_snd_pcm_sw_params_set_silence_size = (dyn_snd_pcm_sw_params_set_silence_size *) dlsym(lib, "snd_pcm_sw_params_set_silence_size");
-+    _dl_snd_pcm_sw_params_set_silence_threshold = (dyn_snd_pcm_sw_params_set_silence_threshold *) dlsym(lib, "snd_pcm_sw_params_set_silence_threshold");
-+    _dl_snd_pcm_writei = (dyn_snd_pcm_writei *) dlsym(lib, "snd_pcm_writei");
-+    _dl_snd_strerror = (dyn_snd_strerror *) dlsym(lib, "snd_strerror");
-+
-     if (dlerror() == NULL)
- 	return true;
-     fprintf(stderr, "Could not load all required symbols from " ALSALIB "\nusing gdk_beep() for BEEP and TONE.\n");
diff --git a/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch b/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
index c6fc731c7469..04785a96b9ea 100644
--- a/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
+++ b/app-emulation/free42/files/free42-1.4.77-fix-makefile.patch
@@ -1,20 +1,20 @@
-diff -Nur a/gtk/Makefile b/gtk/Makefile
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
 --- a/gtk/Makefile	2013-01-06 07:27:27.000000000 +0100
-+++ b/gtk/Makefile	2013-01-21 19:37:26.051512802 +0100
-@@ -15,14 +15,10 @@
++++ b/gtk/Makefile	2014-06-23 23:41:29.669913497 +0200
+@@ -15,13 +15,9 @@
  # along with this program; if not, see http://www.gnu.org/licenses/.
  ###############################################################################
  
 -CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -g -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\""
 -LDFLAGS = -L/usr/X11R6/lib
-+CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
-+LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
- LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
+-LIBS := -lXmu $(shell pkg-config --libs gtk+-2.0)
+-
 -ifeq "$(shell uname -s)" "Linux"
 -LDFLAGS += -Wl,--hash-style=both
 -endif
--
++CXXFLAGS := -MMD -Wall -Wno-parentheses -Wno-write-strings -I/usr/X11R6/include -fno-exceptions -fno-rtti $(shell pkg-config --cflags gtk+-2.0) -DVERSION="\"$(shell cat ../VERSION)\"" ${CXXFLAGS}
++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
++LIBS := -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0)
+ 
  SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
  	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
- 	core_commands3.cc core_commands4.cc core_commands5.cc \
diff --git a/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch b/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch
new file mode 100644
index 000000000000..8f73b4405e7f
--- /dev/null
+++ b/app-emulation/free42/files/free42-1.5.3a-fix-makefile.patch
@@ -0,0 +1,30 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2014-06-21 19:46:55.000000000 +0200
++++ b/gtk/Makefile	2014-06-24 00:03:38.719906032 +0200
+@@ -19,7 +19,6 @@
+ 	    -Wall \
+ 	    -Wno-parentheses \
+ 	    -Wno-write-strings \
+-	    -g \
+ 	    -I/usr/X11R6/include \
+ 	    -fno-exceptions \
+ 	    -fno-rtti \
+@@ -30,14 +29,11 @@
+ 	    -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	    -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+ 	    -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
+-	    -D_WCHAR_T_DEFINED
++	    -D_WCHAR_T_DEFINED \
++	    ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS := gcc111libbid-$(shell uname -m).a -lXmu $(shell pkg-config --libs gtk+-2.0)
+-
+-ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
+-endif
++LDFLAGS := -L/usr/X11R6/lib ${LDFLAGS}
++LIBS := gcc111libbid-$(shell uname -m).a -lXmu -lX11 -ldl -lpthread $(shell pkg-config --libs gtk+-2.0)
+ 
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
diff --git a/app-emulation/free42/free42-1.4.77.ebuild b/app-emulation/free42/free42-1.4.77.ebuild
index f53fb33cae5f..8cc6cdbb664a 100644
--- a/app-emulation/free42/free42-1.4.77.ebuild
+++ b/app-emulation/free42/free42-1.4.77.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.77.ebuild,v 1.4 2013/02/25 11:39:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.77.ebuild,v 1.5 2014/06/23 21:47:40 nimiux Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
diff --git a/app-emulation/free42/free42-1.4.75.ebuild b/app-emulation/free42/free42-1.5.3a.ebuild
similarity index 61%
rename from app-emulation/free42/free42-1.4.75.ebuild
rename to app-emulation/free42/free42-1.5.3a.ebuild
index fc7bb589f476..2e4b44051140 100644
--- a/app-emulation/free42/free42-1.4.75.ebuild
+++ b/app-emulation/free42/free42-1.5.3a.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.75.ebuild,v 1.6 2012/12/16 20:02:53 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.5.3a.ebuild,v 1.1 2014/06/24 08:47:11 nimiux Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
@@ -26,23 +26,18 @@ RDEPEND="${DEPEND}
 	x11-libs/libX11
 	x11-libs/libXmu"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}-nologo-${PV}"
 
 src_prepare() {
-	sed -i -e '/^CXXFLAGS :=/{s/-g //;s/$/ \$\{CXXFLAGS\}/}' \
-		"${S}/gtk/Makefile" || die
-	sed -i -e '/^LDFLAGS =/{s/=/:=/;s/$/ \$\{LDFLAGS\}/}' \
-		"${S}/gtk/Makefile" || die
-	sed -i -e '/^LDFLAGS +=/d' "${S}/gtk/Makefile" || die
 	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
 		"${S}/gtk/shell_main.cc" || die
-	epatch "${FILESDIR}"/${P}-fix-alsa.patch
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
 }
 
 src_compile() {
 	local myconf
 	use alsa && myconf="AUDIO_ALSA=yes"
-	emake -j1 CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+	emake CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
 }
 
 src_install() {
diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index 81794d2e2513..b6bbff7157f3 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,4 +1 @@
-DIST pommed-1.21.tar.gz 1005380 SHA256 56cf4e2d85d832b0231542f52f3c6928de675b8dc75175f9ea214ca9206a30bf SHA512 265810a50760c9b489eafb8e56ee49574d1e416413e08a12ea3cbbf3485d6864b58aaedf12dd98ce205b2fb9ced1b9a892b6f6758f09ff0b7157c4a1e2f11c7c WHIRLPOOL 23499b0910ef4cbd509df8554e1b6e6efc3793570cc9f62d0ffd9fa649b7086af8b35739dde6167662551c4eacc0e3dfb4132fd4e2c73cc51f475bff5e585665
-DIST pommed-1.30.tar.gz 993702 SHA256 4a09d18fb6e289aaee9cd95070ce5c73c59cea74cdedf81c1b954c3404eab60f SHA512 005865c5c6d9906617206fa0f0d69cf9bb7feaa5806f7cfa8411d785f145acfd0e313821dd7da961c672721317eaf8f4cb17f9172f9e8bf51cf47faa5b89bfd6 WHIRLPOOL 5b31bb9d20a7bc2dfe30570ea2a76ddc3827b488ba457f7c697275e538bb17d8886aa4424c56dc133c33d4e5f61a37ab8c3e670672aa1c8da22f0664a3174a30
-DIST pommed-1.31.tar.gz 993795 SHA256 58d3c2583f49f79bdb2f3b614964cd1a1543e38c4b8312f2da6768fe60795c8b SHA512 be78582d459600198d72425903d7135d27d0c8cead11a6b7c52fcd49d176eddeebaba4e688f47ace7724bc7270bfd48908e45d724bfe17b9b8f095fe130cc1c4 WHIRLPOOL 852b2a0f4b5f8cb940ce6711ccd76b2de7606b245eab6c67a7091661ebc1e3eafbfafba18f53f04dff6f92129bfc4eb117260347ddd93c0840857a76ca3389de
 DIST pommed-1.39.tar.gz 995020 SHA256 d715cf1f85525a62bb18a3f9ebd229a2f586906ab8c9306fc9d2aa192bf79da2 SHA512 26568e359d8ef853710b1d86f397981e87245a84b2ff006964035ea8643e97df44fe52b01841d085eb8dd1aee586e1c8b60c44089f463e2a64b2b95c010a9d10 WHIRLPOOL cdb214162f87e24f8add4023d126a8a0fe2db0714a29dc43ec844dc4eb8b02edecc6866ba41555fea13881c30e6fb5439c99b452ee5f2240db9969e9504ab298
diff --git a/app-laptop/pommed/pommed-1.21-r1.ebuild b/app-laptop/pommed/pommed-1.21-r1.ebuild
deleted file mode 100644
index e3df2ba3bf1e..000000000000
--- a/app-laptop/pommed/pommed-1.21-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.21-r1.ebuild,v 1.7 2012/09/05 07:13:42 jlec Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook"
-HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
-ALIOTH_NUMBER="2499"
-SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk X"
-
-COMMON_DEPEND="media-libs/alsa-lib
-	x86? ( sys-apps/pciutils )
-	amd64? (  sys-apps/pciutils )
-	dev-libs/confuse
-	>=sys-apps/dbus-1.1
-	dev-libs/dbus-glib
-	sys-libs/zlib
-	media-libs/audiofile
-	gtk? ( x11-libs/gtk+:2
-		gnome-base/libglade:2.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXpm )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/alsa-utils
-	virtual/eject"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-r1.patch"
-}
-
-src_compile() {
-	cd "${S}"/pommed
-	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
-
-	if use gtk; then
-		cd "${S}"/gpomme
-		local POFILES=""
-		for LANG in ${LINGUAS}; do
-			if [ -f po/${LANG}.po ]; then
-				POFILES="${POFILES} po/${LANG}.po"
-			fi
-		done
-		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
-	fi
-	if use X; then
-		cd "${S}"/wmpomme
-		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	if use x86 || use amd64; then
-		newins pommed.conf.mactel pommed.conf
-	elif use ppc; then
-		newins pommed.conf.pmac pommed.conf
-	fi
-
-	insinto /etc/dbus-1/system.d
-	newins dbus-policy.conf pommed.conf
-
-	insinto /usr/share/pommed
-	doins pommed/data/*.wav
-
-	dobin pommed/pommed
-
-	newinitd "${FILESDIR}"/pommed.rc pommed
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use gtk ; then
-		dobin gpomme/gpomme
-		for LANG in ${LINGUAS}; do
-			if [ -f gpomme/po/${LANG}.mo ]; then
-				einfo "Installing lang ${LANG}"
-				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
-				doins gpomme/po/${LANG}.mo
-			fi
-		done
-
-		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
-		insinto /usr/share/gpomme/
-		doins -r gpomme/themes
-		doins gpomme/gpomme.glade
-	fi
-
-	if use X ; then
-		dobin wmpomme/wmpomme
-	fi
-}
diff --git a/app-laptop/pommed/pommed-1.30.ebuild b/app-laptop/pommed/pommed-1.30.ebuild
deleted file mode 100644
index 287658deb6b8..000000000000
--- a/app-laptop/pommed/pommed-1.30.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.30.ebuild,v 1.8 2012/09/05 07:13:42 jlec Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs linux-info
-
-DESCRIPTION="Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook"
-HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
-ALIOTH_NUMBER="3159"
-SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk X"
-
-COMMON_DEPEND="media-libs/alsa-lib
-	x86? ( sys-apps/pciutils )
-	amd64? (  sys-apps/pciutils )
-	dev-libs/confuse
-	>=sys-apps/dbus-1.1
-	dev-libs/dbus-glib
-	sys-libs/zlib
-	media-libs/audiofile
-	gtk? ( x11-libs/gtk+:2
-		gnome-base/libglade:2.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXpm )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/alsa-utils
-	virtual/eject"
-
-pkg_setup() {
-	if ! use ppc; then
-		linux-info_pkg_setup
-
-		CONFIG_CHECK="~DMIID"
-		check_extra_config
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-}
-
-src_compile() {
-	cd "${S}"/pommed
-	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
-
-	if use gtk; then
-		cd "${S}"/gpomme
-		local POFILES=""
-		for LANG in ${LINGUAS}; do
-			if [ -f po/${LANG}.po ]; then
-				POFILES="${POFILES} po/${LANG}.po"
-			fi
-		done
-		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
-	fi
-	if use X; then
-		cd "${S}"/wmpomme
-		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	if use x86 || use amd64; then
-		newins pommed.conf.mactel pommed.conf
-	elif use ppc; then
-		newins pommed.conf.pmac pommed.conf
-	fi
-
-	insinto /etc/dbus-1/system.d
-	newins dbus-policy.conf pommed.conf
-
-	insinto /usr/share/pommed
-	doins pommed/data/*.wav
-
-	dobin pommed/pommed
-
-	newinitd "${FILESDIR}"/pommed.rc pommed
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use gtk ; then
-		dobin gpomme/gpomme
-		for LANG in ${LINGUAS}; do
-			if [ -f gpomme/po/${LANG}.mo ]; then
-				einfo "Installing lang ${LANG}"
-				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
-				doins gpomme/po/${LANG}.mo
-			fi
-		done
-
-		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
-		insinto /usr/share/gpomme/
-		doins -r gpomme/themes
-		doins gpomme/gpomme.glade
-	fi
-
-	if use X ; then
-		dobin wmpomme/wmpomme
-	fi
-}
diff --git a/app-laptop/pommed/pommed-1.31.ebuild b/app-laptop/pommed/pommed-1.31.ebuild
deleted file mode 100644
index 01d40b107350..000000000000
--- a/app-laptop/pommed/pommed-1.31.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.31.ebuild,v 1.8 2012/09/05 07:13:42 jlec Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs linux-info
-
-DESCRIPTION="Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook"
-HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
-ALIOTH_NUMBER="3202"
-SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk X"
-
-COMMON_DEPEND="media-libs/alsa-lib
-	x86? ( sys-apps/pciutils )
-	amd64? (  sys-apps/pciutils )
-	dev-libs/confuse
-	>=sys-apps/dbus-1.1
-	dev-libs/dbus-glib
-	sys-libs/zlib
-	media-libs/audiofile
-	gtk? ( x11-libs/gtk+:2
-		gnome-base/libglade:2.0 )
-	X? ( x11-libs/libX11
-		x11-libs/libXpm )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/alsa-utils
-	virtual/eject"
-
-pkg_setup() {
-	if ! use ppc; then
-		linux-info_pkg_setup
-
-		CONFIG_CHECK="~DMIID"
-		check_extra_config
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-}
-
-src_compile() {
-	cd "${S}"/pommed
-	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
-
-	if use gtk; then
-		cd "${S}"/gpomme
-		local POFILES=""
-		for LANG in ${LINGUAS}; do
-			if [ -f po/${LANG}.po ]; then
-				POFILES="${POFILES} po/${LANG}.po"
-			fi
-		done
-		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
-	fi
-	if use X; then
-		cd "${S}"/wmpomme
-		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	if use x86 || use amd64; then
-		newins pommed.conf.mactel pommed.conf
-	elif use ppc; then
-		newins pommed.conf.pmac pommed.conf
-	fi
-
-	insinto /etc/dbus-1/system.d
-	newins dbus-policy.conf pommed.conf
-
-	insinto /usr/share/pommed
-	doins pommed/data/*.wav
-
-	dobin pommed/pommed
-
-	newinitd "${FILESDIR}"/pommed.rc pommed
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use gtk ; then
-		dobin gpomme/gpomme
-		for LANG in ${LINGUAS}; do
-			if [ -f gpomme/po/${LANG}.mo ]; then
-				einfo "Installing lang ${LANG}"
-				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
-				doins gpomme/po/${LANG}.mo
-			fi
-		done
-
-		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
-		insinto /usr/share/gpomme/
-		doins -r gpomme/themes
-		doins gpomme/gpomme.glade
-	fi
-
-	if use X ; then
-		dobin wmpomme/wmpomme
-	fi
-}
diff --git a/app-laptop/pommed/pommed-1.39.ebuild b/app-laptop/pommed/pommed-1.39.ebuild
deleted file mode 100644
index db9966628e37..000000000000
--- a/app-laptop/pommed/pommed-1.39.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.39.ebuild,v 1.7 2012/09/09 16:23:29 josejx Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs linux-info
-
-DESCRIPTION="Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook"
-HOMEPAGE="http://technologeek.org/projects/pommed/index.html"
-ALIOTH_NUMBER="3583"
-SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk X"
-
-COMMON_DEPEND="media-libs/alsa-lib
-	x86? ( sys-apps/pciutils )
-	amd64? (  sys-apps/pciutils )
-	dev-libs/confuse
-	>=sys-apps/dbus-1.1
-	dev-libs/dbus-glib
-	sys-libs/zlib
-	media-libs/audiofile
-	gtk? ( x11-libs/gtk+:2 )
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/alsa-utils
-	virtual/eject"
-
-pkg_setup() {
-	if ! use ppc; then
-		linux-info_pkg_setup
-
-		CONFIG_CHECK="~DMIID"
-		check_extra_config
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-}
-
-src_compile() {
-	cd "${S}"/pommed
-	emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed"
-
-	if use gtk; then
-		cd "${S}"/gpomme
-		local POFILES=""
-		for LANG in ${LINGUAS}; do
-			if [ -f po/${LANG}.po ]; then
-				POFILES="${POFILES} po/${LANG}.po"
-			fi
-		done
-		emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed"
-	fi
-	if use X; then
-		cd "${S}"/wmpomme
-		emake CC="$(tc-getCC)" || die "emake wmpomme failed"
-	fi
-}
-
-src_install() {
-	insinto /etc
-	if use x86 || use amd64; then
-		newins pommed.conf.mactel pommed.conf
-	elif use ppc; then
-		newins pommed.conf.pmac pommed.conf
-	fi
-
-	insinto /etc/dbus-1/system.d
-	newins dbus-policy.conf pommed.conf
-
-	insinto /usr/share/pommed
-	doins pommed/data/*.wav
-
-	dobin pommed/pommed
-
-	newinitd "${FILESDIR}"/pommed.rc pommed
-
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use gtk ; then
-		dobin gpomme/gpomme
-		for LANG in ${LINGUAS}; do
-			if [ -f gpomme/po/${LANG}.mo ]; then
-				einfo "Installing lang ${LANG}"
-				insinto /usr/share/locale/${LANG}/LC_MESSAGES/
-				doins gpomme/po/${LANG}.mo
-			fi
-		done
-
-		domenu gpomme/gpomme.desktop gpomme/gpomme-c.desktop
-		insinto /usr/share/gpomme/
-		doins -r gpomme/themes
-	fi
-
-	if use X ; then
-		dobin wmpomme/wmpomme
-	fi
-}
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
index 38bad00618af..ce8e84bf7580 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1,2 +1,2 @@
-DIST evemu-1.1.0.tar.xz 482884 SHA256 2a10065b66f85053476082f07b8af4fb96d4abe35509e1fd0e166326195fc9dd SHA512 2915ef6ee651a6fbf1c10c3a7562f748be376fd7fe13f3c3e9ef3ac959d1250c2c38c758f29361e134a97a6087cd3f1fbf307a959235f6022bab7daa65dd3c10 WHIRLPOOL 978da8be9e0a083edb07960f868cd42c89d0f1f2861698845236a267b55611435c09d6c864c361b1de404efaa06a84fe43879efc9d88ebd55aee4471650f8596
 DIST evemu-1.2.0.tar.xz 498400 SHA256 bcc2a97a8e10048ff6b9122180d27ccada63d4f8ca89e61e962201a13551f475 SHA512 41bef7b2e0f0769e4affb5633f41e5352224f5acfb5a001a27548f2236a1dc23d444bbfc3e93ea8eb518a7f4e628185eef9ca5ecefa4d87b201224bfeee28044 WHIRLPOOL 31879f637959265f7c8067c8dedd2b57fa82aeaac94af53fd42270715579163165f7a3d4fb460f2d15080c42d467c4a872c1dbc964018b684f32db49613ef97b
+DIST evemu-2.0.0.tar.xz 508212 SHA256 2734e980c2bd7450270aec49a14e04d0042a6d39d3946c23ed99a3f86c9af061 SHA512 4853c36dda5e5e015561cffe0cbfbe8e17c10562c7842dd0d9a969cd1b26a1513be49f4310733be862c847828b6dae1cb77b0ae6c98463fcd7cf8619f6502053 WHIRLPOOL a222ebd92c146e3a787b6a51ea5edb2aa373ce2be1b2b82988786e575f744ac206febce0af5c0e2be3c2e43b1155f387e6db5f1dcde5e0aa739ca09ab0f8d111
diff --git a/app-misc/evemu/evemu-1.2.0.ebuild b/app-misc/evemu/evemu-1.2.0.ebuild
deleted file mode 100644
index 3a4a676607a3..000000000000
--- a/app-misc/evemu/evemu-1.2.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/evemu/evemu-1.2.0.ebuild,v 1.1 2013/12/22 11:10:12 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils python-single-r1
-
-DESCRIPTION="Tools and bindings for kernel input event device emulation, data capture, and replay"
-HOMEPAGE="http://www.freedesktop.org/wiki/Evemu/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="app-arch/xz-utils
-	${RDEPEND}"
-
-src_prepare() {
-	if ! use python ; then
-		sed '/SUBDIRS/s/python//' -i Makefile.am || die
-		autotools-utils_src_prepare
-	fi
-}
-
-src_test() {
-	if use python ; then
-		if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
-			ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
-		else
-			emake check
-		fi
-	fi
-}
diff --git a/app-misc/evemu/evemu-1.1.0.ebuild b/app-misc/evemu/evemu-2.0.0.ebuild
similarity index 73%
rename from app-misc/evemu/evemu-1.1.0.ebuild
rename to app-misc/evemu/evemu-2.0.0.ebuild
index 6fb44f21ad87..7727a07c70f0 100644
--- a/app-misc/evemu/evemu-1.1.0.ebuild
+++ b/app-misc/evemu/evemu-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/evemu/evemu-1.1.0.ebuild,v 1.2 2013/05/29 08:55:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/evemu/evemu-2.0.0.ebuild,v 1.1 2014/06/24 04:30:55 radhermit Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
 AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
@@ -19,15 +19,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	>=dev-libs/libevdev-0.5"
 DEPEND="app-arch/xz-utils
 	${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.2.0-install-man.patch )
+
 src_prepare() {
 	if ! use python ; then
 		sed '/SUBDIRS/s/python//' -i Makefile.am || die
-		autotools-utils_src_prepare
 	fi
+	autotools-utils_src_prepare
 }
 
 src_test() {
diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
index 5269dc895b71..163e182bb568 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11-r3.ebuild,v 1.3 2014/06/14 10:32:57 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11-r3.ebuild,v 1.4 2014/06/24 08:53:57 nimiux Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/dev-libs/boost/boost-1.55.0-r1.ebuild b/dev-libs/boost/boost-1.55.0-r1.ebuild
index cd07a4a26b29..fe2e71f2a58f 100644
--- a/dev-libs/boost/boost-1.55.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.55.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.5 2014/04/28 07:20:08 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.55.0-r1.ebuild,v 1.6 2014/06/23 15:36:15 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
 inherit eutils flag-o-matic multilib multiprocessing python-r1 toolchain-funcs versionator
 
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 32055bea5314..a7c88171dfe9 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,2 +1,2 @@
 DIST libgit2-glib-0.0.12.tar.xz 396768 SHA256 193125b314f588894b769058be28101fb0b2bec345520ca6398ee4e8b7319762 SHA512 b3299a20a1a24243604f33dff1e9df0ac0c244049d99e6ec29e9ae405e4370ff229b4b8186593347515930fd483a2b78dcb041d33749076f9dc9778d3674da06 WHIRLPOOL 41adce53f6b08172bcb9940f21141665fbcde04962ede9f68f1797cceeca8c68f156c5668d5a84f392a92ef57f2bc45a9e8b706cd2df98ec0e352ec66463b9cd
-DIST libgit2-glib-0.0.14.tar.xz 396284 SHA256 474d0327d6052662a364b3c0c2068bdab2168c58d00757aed3f9f87ffd580afc SHA512 7d651f048db2741c7d6899946c7346ee42bd1c639fedc979c27afec0bcc9804636a7e7fa9b9f42e32455ecef2840314eaf339ed7d874f062c4483e9e8397d12c WHIRLPOOL b139b08b4d2c862fe83a5fcdee6fa9fd14628ee2b972dee10bd80981a1645e044bf749c817956bdfa2627508321f7d9c70a1d5356390679a3048ad8a2e46aaec
+DIST libgit2-glib-0.0.16.tar.xz 396212 SHA256 36fa374e2c01b42aab885c91f9a0da184a21fa06c9e3a273a3d4f593c083627e SHA512 1fcdec0dea0a5ba580e49ebc9805765adbeb827292f9a2686f8289dc98604a332bb4e553f4c74927020352f15eb3e0589c211c4b96d524167dc447268a382194 WHIRLPOOL 236286633c9aec5bcaeaa762e07ea4615081fb610dcf712bea48943aa34cd17ba371c5ec77cf3906ca16c83efe1d710feec486c7fc7c4743a82d1128fd21437e
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
index 8c480ab5c8d6..9ea661ef6a11 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild,v 1.3 2014/03/09 11:55:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.0.12.ebuild,v 1.4 2014/06/24 00:58:25 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,8 @@ IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/libgit2-0.20.0
+	>=dev-libs/libgit2-0.20.0:=
+	<dev-libs/libgit2-0.21
 	>=dev-libs/glib-2.28.0:2
 	>=dev-libs/gobject-introspection-0.10.1
 	python? (
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.0.14.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
similarity index 89%
rename from dev-libs/libgit2-glib/libgit2-glib-0.0.14.ebuild
rename to dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
index ace961ce33bc..4910f5b301b4 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.0.14.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.0.14.ebuild,v 1.1 2014/06/22 17:11:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2-glib/libgit2-glib-0.0.16.ebuild,v 1.1 2014/06/24 00:58:25 tetromino Exp $
 
 EAPI=5
 
@@ -20,7 +20,7 @@ IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
-	>=dev-libs/libgit2-0.21.0
+	>=dev-libs/libgit2-0.21.0:=
 	>=dev-libs/glib-2.28.0:2
 	>=dev-libs/gobject-introspection-0.10.1
 	python? (
diff --git a/dev-libs/libpcre/libpcre-7.9-r1.ebuild b/dev-libs/libpcre/libpcre-7.9-r1.ebuild
index b504edc2b4f3..e2ba9a0f2160 100644
--- a/dev-libs/libpcre/libpcre-7.9-r1.ebuild
+++ b/dev-libs/libpcre/libpcre-7.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9-r1.ebuild,v 1.14 2012/05/25 16:39:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.9-r1.ebuild,v 1.15 2014/06/24 03:50:06 patrick Exp $
 
 EAPI=2
 
@@ -60,10 +60,3 @@ src_install() {
 	use doc && dohtml doc/html/*
 	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
-
-pkg_postinst() {
-	elog "This version of ${PN} has stopped installing .la files. This may"
-	elog "cause compilation failures in other packages. To fix this problem,"
-	elog "install dev-util/lafilefixer and run:"
-	elog "lafilefixer --justfixit"
-}
diff --git a/dev-libs/libpcre/libpcre-8.02.ebuild b/dev-libs/libpcre/libpcre-8.02.ebuild
index 330e539e114f..964788486a3a 100644
--- a/dev-libs/libpcre/libpcre-8.02.ebuild
+++ b/dev-libs/libpcre/libpcre-8.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.02.ebuild,v 1.11 2012/05/25 16:39:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.02.ebuild,v 1.12 2014/06/24 03:50:06 patrick Exp $
 
 EAPI=2
 
@@ -52,10 +52,3 @@ src_install() {
 	gen_usr_ldscript -a pcre
 	find "${D}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
 }
-
-pkg_postinst() {
-	elog "This version of ${PN} has stopped installing .la files. This may"
-	elog "cause compilation failures in other packages. To fix this problem,"
-	elog "install dev-util/lafilefixer and run:"
-	elog "lafilefixer --justfixit"
-}
diff --git a/dev-libs/qof/Manifest b/dev-libs/qof/Manifest
index ec3a5b20f4ff..894a93d7964b 100644
--- a/dev-libs/qof/Manifest
+++ b/dev-libs/qof/Manifest
@@ -1 +1,2 @@
 DIST qof-0.8.1.tar.gz 885073 SHA256 53fa6db79140ae5ff0863298bdd1c09cfdf187d3967a90ca519a5713fec9c154 SHA512 ca6c8ab891627117993e5113065959dcfdd9cbe8b836151d75e2bea22ddbb98b0b68fa1e5fc52656242228303771eec36146aba3e43a4c70c10d7d0e7df70971 WHIRLPOOL 05c3740743e4908d14a9aaaf1078b4a6d02edc4c0d0879817a6db753492683744f7d3ca511d4f51eedd6550635ec4c6f6e7fd4cdf5a4b04d0c761928bf063854
+DIST qof_0.8.7.orig.tar.gz 932957 SHA256 86fd671390dc13ee6fd2e1e13775786c518b0ebff5e886f27bbd394de1e73094 SHA512 ed121aa599f785aab861e3441a96cc20e82f3a4d8fe4292d27fedbae4ffa79408811c98bb841ef9be5a465e482ad67c4878589098dc0b5477948151e41ee298c WHIRLPOOL e49f36cfaf5b8604ce4def5f7d3910ff9daf419dcfc65a41825c97a0dfb76d435b01fd71d01f647a7e6bbc9774155cccadf30da7b78fc4978cf0ee39ea56458b
diff --git a/dev-libs/qof/qof-0.8.7.ebuild b/dev-libs/qof/qof-0.8.7.ebuild
new file mode 100644
index 000000000000..da8a6ff21794
--- /dev/null
+++ b/dev-libs/qof/qof-0.8.7.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/qof/qof-0.8.7.ebuild,v 1.1 2014/06/24 10:32:07 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2
+
+DESCRIPTION="A Query Object Framework"
+HOMEPAGE="https://alioth.debian.org/projects/qof/"
+SRC_URI="mirror://debian//pool/main/q/${PN}/${PN}_${PV}.orig.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc nls sqlite"
+
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/glib:2
+	sqlite? ( >=dev-db/sqlite-2.8.0:0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	!dev-libs/qof:0
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-latex )
+"
+
+src_prepare() {
+	sed -i -e 's/-g2 //' configure.ac || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-error-on-warning \
+		--disable-static \
+		--disable-gdasql \
+		--disable-gdabackend \
+		$(use_enable nls) \
+		$(use_enable sqlite) \
+		$(use_enable doc doxygen) \
+		$(use_enable doc latex-docs) \
+		$(use_enable doc html-docs)
+}
+
+src_compile() {
+	# upstream bug ????
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
+}
diff --git a/dev-python/fabric/fabric-1.9.0.ebuild b/dev-python/fabric/fabric-1.9.0.ebuild
index c1ec42c76432..10e393773385 100644
--- a/dev-python/fabric/fabric-1.9.0.ebuild
+++ b/dev-python/fabric/fabric-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.9.0.ebuild,v 1.1 2014/06/12 09:13:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fabric/fabric-1.9.0.ebuild,v 1.2 2014/06/24 10:03:58 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -19,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND="<dev-python/paramiko-1.13[${PYTHON_USEDEP}]"
+# since 'paramiko>=1.10' is what we have in portage, paramiko can be set unversioned
+RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 6400465dc4b5..8e39391f8c7d 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,3 +1,4 @@
 DIST pandas-0.12.0.tar.gz 3155059 SHA256 be9b4c3611801b366873531bc87a87dd16b19e7d78fa84c21898cd007931c86d SHA512 da5dbd6109f7c96b762fcdf695ed50da8059ca78f645b0dec9a741ed89638ba43f8b336d339d3d4c250585ddfddff240b40bb25e99ab642eed825c649f2fd59e WHIRLPOOL 19cb14eff3b397d80d2c33d55c980b1db1793c087048be9cc13718e50f6034aa3f15fe27866cc13f778fa71cf3c91147449865b9597087622fa9cf24e71d527d
 DIST pandas-0.13.0.tar.gz 3604253 SHA256 5bb3f7a5f24fe8280e84e5407dc129364e7825cbe366b79676bd5f37a9b2bf0e SHA512 c5e2673f9a3b1e28d038bf3e5911445c8e77f4669eb5df5849062b41c96f93b6f09fa87421ae7382ba50f53c9ac0cf9564bbff5b300f097bf929fca366a500a6 WHIRLPOOL 91257ed915f7ead4d68e0ebf360f326e4e32e8de51c79c315902f297e3c05bd3a525861e6f575419c6c6eb141ecbb0228e6886c02be49a565324b319b0a65fd0
 DIST pandas-0.13.1.tar.gz 6096890 SHA256 6813746caa796550969ed98069f16627f070f6d8d60686cfb3fa0e66c2e0312b SHA512 a5fc36141f1b9269ce69ea35f8308abea3e6a77e54fe5df3d3614f1b9ea79f1c4b1c07da1b78d5d26f7ccf238a7c569a978caaa411217c290f7a1870e878e1f2 WHIRLPOOL a091570987c55190fe3650443392b4858938e7a77145a25859f2f9e479d1701876fa06a75610ef2771543cf8574ae992793c9377b6a246cab371edbd16a5eb40
+DIST pandas-0.14.0.tar.gz 6526846 SHA256 f7997debca756c4dd5ccdf5a010dfe3d1c7dac98ee706b715d994cf7c9d35528 SHA512 905782956e6aa1bc15c8dd407d2cb731b8bdeb38e4e85d149d1ba665b88c47ff38566b19e382a83a17ef5d09a19a627d77b9afdd96dc0c0abda62ad9152b4083 WHIRLPOOL 9e8bb971cef93fd15faba7a2a4f032f266849d5f1e7d2a8f0233b73cf26c97fa78044de8617ea54b3d991591758c57bec2cb2a913b7d7735d858c420fe6bef65
diff --git a/dev-python/pandas/pandas-0.13.1.ebuild b/dev-python/pandas/pandas-0.13.1.ebuild
index 199c71e87fcc..5cedd7552f8b 100644
--- a/dev-python/pandas/pandas-0.13.1.ebuild
+++ b/dev-python/pandas/pandas-0.13.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.13.1.ebuild,v 1.1 2014/02/21 12:04:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.13.1.ebuild,v 1.2 2014/06/24 00:37:17 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/pandas/pandas-0.14.0.ebuild b/dev-python/pandas/pandas-0.14.0.ebuild
new file mode 100644
index 000000000000..9dc91cfd76dd
--- /dev/null
+++ b/dev-python/pandas/pandas-0.14.0.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.14.0.ebuild,v 1.2 2014/06/24 06:03:56 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.sourceforge.net/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples excel html test R"
+
+REQUIRED_USE="
+	excel? ( !python_targets_python3_2 )
+	doc? ( !python_targets_python3_2 )
+	R? ( !python_targets_python3_2 )"
+
+CDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	doc? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/pytables[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[$(python_gen_usedep 'python2_7')]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2*')]
+		dev-python/xlwt[$(python_gen_usedep 'python2*')]
+		sci-libs/scikits_timeseries[$(python_gen_usedep 'python2*')]
+		x11-misc/xclip
+		)
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+	dev-python/numexpr[${PYTHON_USEDEP}]
+	dev-python/bottleneck[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pytables[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	excel? (
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		dev-python/xlrd[$(python_gen_usedep 'python2*')]
+		dev-python/xlwt[$(python_gen_usedep 'python2*')]
+	)
+	html? (
+		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		|| (
+			dev-python/lxml[${PYTHON_USEDEP}]
+			dev-python/html5lib[${PYTHON_USEDEP}] )
+	)
+	R? ( dev-python/rpy[$(python_gen_usedep 'python2_7')] )"
+
+python_prepare_all() {
+	if use doc; then
+		# Prevent un-needed download during build
+		sed -e 's:^intersphinx_mapping:#intersphinx_mapping:' \
+			-e "s:^    'statsmodels:#    'statsmodels:" \
+			-e "s:^    'python:#    'python:" \
+			-e "s:^}:#}:" \
+			-i doc/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+	fi
+}
+
+src_test() {
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	pushd  "${BUILD_DIR}"/lib > /dev/null
+	PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+		VIRTUALX_COMMAND="nosetests --verbosity=3 pandas" \
+		virtualmake || die
+	popd > /dev/null
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml -r "${BUILD_DIR}"/lib/doc/build/html/*
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pymongo/pymongo-2.7.1.ebuild b/dev-python/pymongo/pymongo-2.7.1.ebuild
index 7f5afa54a73f..b2b330c2b831 100644
--- a/dev-python/pymongo/pymongo-2.7.1.ebuild
+++ b/dev-python/pymongo/pymongo-2.7.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.7.1.ebuild,v 1.1 2014/05/26 08:38:11 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymongo/pymongo-2.7.1.ebuild,v 1.2 2014/06/24 00:55:42 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
 
 inherit check-reqs distutils-r1
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index e918c4fb8dcd..15bf6b072635 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,2 +1,3 @@
 DIST rpy2-2.3.10.tar.gz 187420 SHA256 728326d6d13107f7156f1f3d6ad3a7d6a19ae4d6801e56708e794196d5b0a509 SHA512 58013019bb71c28b0c890a599687628d94fc0a59f7071177618d8494eca485eb08ae9f7d27cf529fe973b01254c00373130b68c8ce863b69f8dcfa54bd5bf9f8 WHIRLPOOL bf8e8c19b75622eb5c923496d0ae1625f3196d3e760fbf60558f692847f0a35a3a1f2112951cb48fa5c9c111fdc145e0babe99f489aa29033b9e21edf0b6180e
 DIST rpy2-2.4.0.tar.gz 160914 SHA256 3cb6360d4d0af7996979f50d0347f5f74fc3fcf98e3ee8057c4c886b358d17e1 SHA512 cd6432ba2f5c4f0e8e0a49e473efd917cfd279f435dc4fa31e417a725085937126ea2435f43f2a9fdd01f2d4f53698f1684375885525fba095ad657e7890facf WHIRLPOOL f67c5ddb7fd3576bf3cc143d6be4b803e49f3b56154c2ad7689a0c90511e7d037b370fa76b64a7d8b72dd49b5850c96382bdd3f67b0145afd68959a8112150b0
+DIST rpy2-2.4.2.tar.gz 161135 SHA256 c88f961e6ea8bbb24dbffab6738a0bc090ca8597ae8292731ae3362e64c839c8 SHA512 e939504d8907772d203e9f999cb31951e4803e125ada8cc1c8103185ec9bbb8a1aa65324aa843f0bfa6686b2a76be66b536d04ee992e18fa1bd3db85970e09e9 WHIRLPOOL 831d5d9ca2b54622731b3d0d65b34f21d3f275c7686060a24b5bf2121e191e11dad264327f6132cba6d634e35851f22d51ace62912233e520080659ca4fb7ef9
diff --git a/dev-python/rpy/rpy-2.4.2.ebuild b/dev-python/rpy/rpy-2.4.2.ebuild
new file mode 100644
index 000000000000..5acdda1eaa0a
--- /dev/null
+++ b/dev-python/rpy/rpy-2.4.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.4.2.ebuild,v 1.1 2014/06/24 01:58:44 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 flag-o-matic
+
+MYSLOT=2
+MY_PN=${PN}${MYSLOT}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the R Programming Language"
+HOMEPAGE="http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 GPL-2 LGPL-2.1 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-lang/R-3
+	dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pandas-0.13[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
+	fi
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib || die
+	${PYTHON} -m 'rpy2.tests' -v || die
+}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 56a9983f5275..a79e7731e89f 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -13,3 +13,4 @@ DIST setuptools-1.1.tar.gz 679747 SHA256 56dde93a410389fc6cb86e9c115249a3414f898
 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
 DIST setuptools-5.0.1.tar.gz 800987 SHA256 3bc21bff50760a592080e4fa5caa194f814383bfe2af5b0b9091bc84b8e32791 SHA512 2fa6799e03f5185a154814cffbd693deae46086e9197342e0ee3794510a81b214894b1ebd1d604b36b12517cc0391fdf660cfcd8900f3042f3fc684de1f5ab1a WHIRLPOOL 9a815c0e79fa3c45d1344fc6280553631ae541573dd6249ee01d0c377b80f629b0ed0c214e51b0a171505cbb4185b352619c5a40ebe096db7597b93640a4ef94
 DIST setuptools-5.1.tar.gz 804805 SHA256 5855a13607cae9123df0981d814d32b5b413b7a20422f642bf3f4c355383485b SHA512 25d7db2b9a03a2c0193d759e52a1e6df9e6566a9f433aee881138ec695094dc7da44b4392c99b2936bdee78ecfe990db8e730de8ebbf264a66f2e760a2a9c987 WHIRLPOOL f4c22ceaa9f09a52d8e9392709691de83d0ba9de58f7d1f2099586f4c5c2c7a416d0dc2d52eaaaf73d1bafefe6ce7f3c036098a794e57bf121eec1f50e9d6c54
+DIST setuptools-5.2.tar.gz 807345 SHA256 603f5dc2207d9930370483ce04cd57a847e7816d541f93c87d60089457306205 SHA512 891613bd8cc3302fb520c02173fd06f708b722263524d29deb387ca495059ed40e313d133f77283105c910fee55988dcd0d449734087648ce18b7e4e0b7174c6 WHIRLPOOL afcda655ac5c07c192b0880472e18dfd4e3485144662ef309410fc1ddb07ed46c46d1e1a97d9ce6dcc67cc40538ab41100b87838d70927bd9490dd11258e83ff
diff --git a/dev-python/setuptools/setuptools-5.2.ebuild b/dev-python/setuptools/setuptools-5.2.ebuild
new file mode 100644
index 000000000000..0f12bba0fffb
--- /dev/null
+++ b/dev-python/setuptools/setuptools-5.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-5.2.ebuild,v 1.1 2014/06/24 03:19:31 radhermit Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="a collection of extensions to Distutils"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	rm -f setuptools/tests/test_packageindex.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" esetup.py test
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 4467bfb1dafc..8f684870012d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,4 +1,2 @@
 DIST tox-1.4.3.tar.gz 71661 SHA256 b998d809d954fd9c30476a56bbbbf20a1a5adaa3e4cc5eb052c7051a682b2021 SHA512 4d7359c8f3d9d6f7c71dbd7d486221eed24b60ccf5de561c558e877ebef69186ed1d4829ef50e5d1d50ae20907aae350ef85748b2ecf4187247fe9623baa54f6 WHIRLPOOL 0a0e715a3dd6f846d0737d29e8a17f1cadc83c6eff72efaa31fd61fe96800b910a8d833b2fc8526643137ef60ffc5bd8833f0fdee59fc2785ac2de38fff118b9
-DIST tox-1.6.1.tar.gz 131654 SHA256 05c72b3b7481b47f48f63436c7355783dc8be77ffd7c2bc948b0b7aa2dd4d0de SHA512 af5e26e1b1a1f62b528063e540424087f99ef467e3b9aae27e6658170218f010cba9af544b42776025d5058ebbaec81cab81eed0a0d67129237635a3905abd10 WHIRLPOOL 219174233cd9a22ba971d85d76b8395b090055fe9f105c92a946add03b0e2dbc43a5c249d669911ac7ec018cea58c3f8d76501ecee6962dd5a9a6cda57033447
-DIST tox-1.7.0.tar.gz 84492 SHA256 4cac3410af8b62f50a6496962af3884bdb1f99d30439511489e8a807e89379f8 SHA512 f7fc0f1028cfd2c4bc6cdf07b2e64cd6ed213676368bb3a6dba4334bbae00ac7afe0576e9fc2e299b1b251342fa7080ab15c1f52e961da7462e904b427932370 WHIRLPOOL 67f8d7e0c3bb1f4aef4db8a9785aa99d1433c7e2f62a95892bcfb48b813904d5c2422a5ff2ca79a1d91a509420ebd17a443b393555bec57ace20d534867e61f4
 DIST tox-1.7.1.tar.gz 84635 SHA256 869cb9e07847a9f0238f5a5029f3621504a5a3ec05af6d878e879b354c6851c4 SHA512 71135f2e1644db28cbfae42be1ed68e55e61fd1ba87bca735d367d36a42ec0a0c03bbcb171514ef38cb64e8b15b66987112d3339e03abaf274d098a9efb1cf93 WHIRLPOOL 6219466a4e2237e3eaf1523150e1a71d73adfe596a3d63700b72b3a3d2f6fd5f09944566667c9264b810b633d987ca1024c12835c46e370d031264b81beb13df
diff --git a/dev-python/tox/tox-1.6.1.ebuild b/dev-python/tox/tox-1.6.1.ebuild
deleted file mode 100644
index e95c894ecf13..000000000000
--- a/dev-python/tox/tox-1.6.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.6.1.ebuild,v 1.2 2014/02/03 10:18:40 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.7-pypy-*"
-inherit distutils eutils
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools
-	>=dev-python/virtualenv-1.8.4
-	dev-python/pip
-	dev-python/pytest
-	>=dev-python/py-1.4.9
-	virtual/python-argparse"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C doc html
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b build-${PYTHON_ABI} \
-			install --root "${T}/test-${PYTHON_ABI}"
-		PATH="${T}/test-${PYTHON_ABI}/usr/bin:${PATH}" \
-		PYTHONPATH="${T}/test-${PYTHON_ABI}/$(python_get_sitedir -b)" py.test -x
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r doc/_build/html/
-}
diff --git a/dev-python/tox/tox-1.7.0.ebuild b/dev-python/tox/tox-1.7.0.ebuild
deleted file mode 100644
index be2ff30cc3cc..000000000000
--- a/dev-python/tox/tox-1.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tox/tox-1.7.0.ebuild,v 1.1 2014/02/03 10:18:40 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="http://tox.testrun.org http://pypi.python.org/pypi/tox"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-1.11[${PYTHON_USEDEP}]
-	dev-python/pip[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	>=dev-python/py-1.4.17[${PYTHON_USEDEP}]
-	virtual/python-argparse[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	distutils_install_for_testing
-	py.test -x || die
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild b/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
index f65f13a09630..c915739d6b4d 100644
--- a/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rexical/rexical-1.0.5-r2.ebuild,v 1.6 2014/06/08 14:41:54 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rexical/rexical-1.0.5-r2.ebuild,v 1.7 2014/06/24 02:29:25 phajdan.jr Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="http://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-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/shoulda/shoulda-3.5.0-r1.ebuild b/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
index 3611bebd9b3b..43c2b952f8ff 100644
--- a/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
+++ b/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild,v 1.2 2014/03/05 21:20:54 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/shoulda/shoulda-3.5.0-r1.ebuild,v 1.3 2014/06/24 06:04:18 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19"
+USE_RUBY="ruby19 ruby20"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -28,3 +28,7 @@ RESTRICT=test
 
 ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
 	>=dev-ruby/shoulda-matchers-1.4.1"
+
+all_ruby_prepare() {
+	sed -e '/git ls-files/d' -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index 3c5340bf638d..fb05ccd61693 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -1,2 +1,3 @@
 DIST ttfunk-1.0.3.gem 457216 SHA256 0832ebbf47fd1b1fd052b6bd9f7414d8053b925d5b23a38553c2f348193a28c2 SHA512 6d158b1ae8a1000cd935710039945002fffae0e96b700a9956e069b4604c81fca5871d0f4c39b830269105b0170952c74d0f7465d3d32217f260e8f2ac42fcef WHIRLPOOL c1f7dc1ffc26a459a0289ab046290d1b973b6b2e419a04cb033fb6ea85464d3406560ca0c19b789598a3a7a946d0ad489a9eeb2b22027e4a0f7d41dc144890d6
 DIST ttfunk-1.1.1.tar.gz 732820 SHA256 7776c9b51dbe11761154f0e8b2696d0da66f7590786121c0e8e303c2acd57c00 SHA512 f22a2ede45783a5b9f78cc32c5ee535277878d20fb792abedcaec3cb09926dbe33e7a9db4da36a3b1e91a2a8f61daa568e8a881e0f0abdbfbc1e7a3103aa4e4f WHIRLPOOL 2010dbf45fde6c46810e641f5a366db6ce28d017a55ffa5b76fb6de7c9d4048e0df6eabcd36c68c4defdc1401c2a6d751309ee0adc132f12c411ff40c2cc3095
+DIST ttfunk-1.2.0.tar.gz 733227 SHA256 611464f2d26a9882805a98fcaab28c0587782b714bdf8e7e0ddd268b38f899f5 SHA512 e1237488cfedce28325c52ecba7e1db87d3ec094ed2081edf332fefbe0ac9c8e93bdc483caf1d32246faff578ba335aeee049acce35229ab1b46a8458f8bcf3c WHIRLPOOL 21824dd084bb9d37545e2de4cba2fb65e911092f6b084db20f48d9d1e67bd258c44df23aab0a8952e9a842c6d27906a6681e9e4820e276d390c86c2c46e50796
diff --git a/dev-ruby/ttfunk/ttfunk-1.2.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.2.0.ebuild
new file mode 100644
index 000000000000..d6fe1aae26ea
--- /dev/null
+++ b/dev-ruby/ttfunk/ttfunk-1.2.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ttfunk/ttfunk-1.2.0.ebuild,v 1.1 2014/06/24 05:47:12 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A TrueType font parser written in pure ruby."
+HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
index 4130cd4c319d..b494110d456b 100644
--- a/dev-util/abi-compliance-checker/Manifest
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -1,3 +1,4 @@
 DIST abi-compliance-checker-1.98.4.tar.gz 258639 SHA256 889f26c3c58c36afbaf1e7bde7f49107f25231acf901ce85a10f93812755401b SHA512 31773a26911b89a2e472fe6b2b9504d4cd196a193765593cec8d7f8a4dbc1ceea7e70585ec8b6d73f2664ca53bafd1c85657c3c4553da3f7cc8e2350e84ce052 WHIRLPOOL 1475e14bb42de5e7d2fa934dec6f1333f72d4e493a87d352a0da4a2e326b75648d1f146e90743f20d9bfd066911b2dd1e568ce98a560dfd14b3f655a303303ff
 DIST abi-compliance-checker-1.98.7.tar.gz 256069 SHA256 b1198a4c726ead9d02d1ab1fdbc384f72c34d43e4d29b8438d1b1460aca73699 SHA512 a925c12b0cebc72ee6af84ea1663a8f3e2333e130c1bff494866a54efc644a1825bfc5ce84d5c183e4031dc4037847b42a808099e127874e0184e83b33d499ec WHIRLPOOL 17c6f92d889e4236abc1607dfc3547b3f20d74084be562e390a177d345026fc539056e302ef0b9a682e6e0203502010af5ec900011a8077790bd1688c680081d
 DIST abi-compliance-checker-1.98.8.tar.gz 259591 SHA256 e3850394b8b8c1e6bad5e4136fc83a8ed8dab9f429c0f6a45cf3d1a7351742cb SHA512 b65d8ad2050e51b15c26e999886ec9b23aee1e7ce3836fc6ede7201f0831a0a8070317908fa33f68fcb552ed997b2949ecb6c663066d307cb1b5edad0bfbb700 WHIRLPOOL 9679fec45ae6e0b6c819ff55b06bd1d5d7bc578dd446498b0e5334d7ffb99a9d5a9d532a0c17586fccd323c027ee89c09490311cfcdab0ab461ab5b0c91f4a46
+DIST abi-compliance-checker-1.99.9.tar.gz 272227 SHA256 52b0daca89fcda73cde126497c8015ca823417074ba02fcff68b7acf2f45e516 SHA512 bf3530463a93ed453c9479fa2907e8e68d34949e71bb552fabc43b37f7fa562a49339adc86de09596a13ccd5586bfc5fcb5df1d03ffa04020d9ac3622025b2be WHIRLPOOL 0d62b5c4b14e814231cfa06ffdcfd7fa44fecd2d154bf57b0abb13f2540f755b3de3179fd9d3c34720329f674285877b3b4e43dc904b9b1ae1c7b3c88467094e
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
new file mode 100644
index 000000000000..b4b6fdd289fd
--- /dev/null
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/abi-compliance-checker/abi-compliance-checker-1.99.9.ebuild,v 1.1 2014/06/23 16:30:58 mgorny Exp $
+
+EAPI=5
+
+DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
+HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	mkdir -p "${D}"/usr || die
+	perl Makefile.pl --install --prefix=/usr --destdir="${D}" || die
+}
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
index 63fe4b8ee161..03ff76f55122 100644
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
+++ b/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild,v 1.2 2013/10/14 21:05:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/abi-compliance-checker/abi-compliance-checker-9999.ebuild,v 1.3 2014/06/23 16:30:58 mgorny Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ inherit git-r3
 
 DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
 HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="mirror://github/lvc/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 9f5278426341..ccf03a4f27e1 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,3 @@
 DIST android-studio-ide-135.1155795-linux.zip 164228773 SHA256 c936c3e5c2f9090eee6d396e7ec358cb41f3f11ba7cd4c374123b8444c43d133 SHA512 933aff14e18309a898b0b002e04765e872f7a7ee6f9e155ad887ebfe15d2a0710444f5d86da4389240bc5759dbe8d8943cfba70bc19e2b159c7bf0918ebd3ebe WHIRLPOOL c72b2be24464f078c76ade887f608a8b41fde372ba0afe7b12508cbc5d685a872e0ff3a965ee4d50eda8a795754e2d9dceba3dbfc676691631222c8b192c1797
 DIST android-studio-ide-135.1195882-linux.zip 165365418 SHA256 21bd7bea5cfab59dfca97c9ebd39f11968c29991b257dcffc58ec642cd885854 SHA512 c56680e63b85d0f9b81da0511c053c2e213893dd23a3150b1028e827f65518d88097b605ca03f70aead36a4575854ae461b6926a4fcd241a43ec999cb4524153 WHIRLPOOL 43ce48d4773667aef3d44b6e9697190c7a994be21c0967ab1fccf440b8b5069c29d34c4a1daba34cf13d56e1e4bc37876b1db6ac24b65a7aa44395ec641dffd7
+DIST android-studio-ide-135.1224218-linux.zip 165824675 SHA256 e01e0be365acedb20bb5a2c8902e997bb50c62304cf9b0986ef286ab16c47e92 SHA512 1b42f62f946f6d3a16405083382fa5f356e66391d8fc5104d12e15ef6e82570b6493cdfde949478db246fab0fb0a05cda0506fb7643c8934faa1d5e8a6b8dfc4 WHIRLPOOL 8e293e92d9f2376f1cb4814a3c5a14b64061e085c26c8bed04274b50a66e181ee538a6269da8ee5d5ec6c6449fe05364d9fcd7ad847af48f357065423807ba80
diff --git a/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild b/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild
new file mode 100644
index 000000000000..94bbf7638bf8
--- /dev/null
+++ b/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.6.1.135.1224218.ebuild,v 1.1 2014/06/23 18:54:41 swift Exp $
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+STUDIO_V=$(get_version_component_range 1-3)
+BUILD_V=$(get_version_component_range 4-5)
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.6"
+S=${WORKDIR}/${PN}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+	newicon "bin/idea.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-vcs/git/git-1.8.1.5-r1.ebuild b/dev-vcs/git/git-1.8.1.5-r1.ebuild
index b2303a00d7c5..97205627461b 100644
--- a/dev-vcs/git/git-1.8.1.5-r1.ebuild
+++ b/dev-vcs/git/git-1.8.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.10 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5-r1.ebuild,v 1.11 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.1.5.ebuild b/dev-vcs/git/git-1.8.1.5.ebuild
index 0718ff3bf6f1..86ade6b867d7 100644
--- a/dev-vcs/git/git-1.8.1.5.ebuild
+++ b/dev-vcs/git/git-1.8.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.16 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.1.5.ebuild,v 1.17 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.2.1.ebuild b/dev-vcs/git/git-1.8.2.1.ebuild
index f1ca174874f9..7b7da3bd11ec 100644
--- a/dev-vcs/git/git-1.8.2.1.ebuild
+++ b/dev-vcs/git/git-1.8.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.8 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.2.1.ebuild,v 1.9 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=4
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.3.2-r1.ebuild b/dev-vcs/git/git-1.8.3.2-r1.ebuild
index 7ebc8df63767..b97690eb3bd1 100644
--- a/dev-vcs/git/git-1.8.3.2-r1.ebuild
+++ b/dev-vcs/git/git-1.8.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.12 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.3.2-r1.ebuild,v 1.13 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.4.5.ebuild b/dev-vcs/git/git-1.8.4.5.ebuild
index d656981fcf56..a39073aad87b 100644
--- a/dev-vcs/git/git-1.8.4.5.ebuild
+++ b/dev-vcs/git/git-1.8.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.4 2014/02/07 07:59:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.4.5.ebuild,v 1.5 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.8.5.5.ebuild b/dev-vcs/git/git-1.8.5.5.ebuild
index 2002a3020321..f951c3eb220d 100644
--- a/dev-vcs/git/git-1.8.5.5.ebuild
+++ b/dev-vcs/git/git-1.8.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.5 2014/05/04 15:15:16 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.8.5.5.ebuild,v 1.6 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.9.2.ebuild b/dev-vcs/git/git-1.9.2.ebuild
index a4f5bc4852be..531a3e6a0e8f 100644
--- a/dev-vcs/git/git-1.9.2.ebuild
+++ b/dev-vcs/git/git-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.2.ebuild,v 1.1 2014/04/09 23:59:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.2.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-1.9.3.ebuild b/dev-vcs/git/git-1.9.3.ebuild
index 897a2d0d5a41..0fafde35f280 100644
--- a/dev-vcs/git/git-1.9.3.ebuild
+++ b/dev-vcs/git/git-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.3.ebuild,v 1.2 2014/05/30 11:37:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.9.3.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -54,7 +54,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-2.0.0-r1.ebuild b/dev-vcs/git/git-2.0.0-r1.ebuild
index b195803fb80d..4428469a2e1e 100644
--- a/dev-vcs/git/git-2.0.0-r1.ebuild
+++ b/dev-vcs/git/git-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0-r1.ebuild,v 1.1 2014/06/01 06:20:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0-r1.ebuild,v 1.2 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-2.0.0.ebuild b/dev-vcs/git/git-2.0.0.ebuild
index b5abb0ca46de..489550d01d99 100644
--- a/dev-vcs/git/git-2.0.0.ebuild
+++ b/dev-vcs/git/git-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0.ebuild,v 1.2 2014/05/30 11:37:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.0.0.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 2759a540fbea..e9b68030975a 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.2 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r1.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 78591f034e14..49f3bcee7143 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.2 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r2.ebuild,v 1.3 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 95d0f87862b3..de502e90cec2 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.3 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999-r3.ebuild,v 1.4 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index a15dbf56b7c0..092cc354b435 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.57 2014/05/28 23:44:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-9999.ebuild,v 1.58 2014/06/24 01:44:07 tetromino Exp $
 
 EAPI=5
 
@@ -55,7 +55,7 @@ CDEPEND="
 		webdav? ( dev-libs/expat )
 	)
 	emacs? ( virtual/emacs )
-	gnome-keyring? ( gnome-base/gnome-keyring )"
+	gnome-keyring? ( gnome-base/libgnome-keyring )"
 
 RDEPEND="${CDEPEND}
 	gpg? ( app-crypt/gnupg )
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
index a9b0a76b7bce..6030088a0e2d 100644
--- a/gnome-base/libgnomeui/Manifest
+++ b/gnome-base/libgnomeui/Manifest
@@ -1 +1 @@
-DIST libgnomeui-2.24.5.tar.bz2 1440172 SHA256 ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f
+DIST libgnomeui-2.24.5.tar.bz2 1440172 SHA256 ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5 WHIRLPOOL 0cfb10abdddd282f45b147fa3214bbaba005e75e5c73ffed962fbb6b828d2e632d3de49c876eb6127bf13b85a9985f3c9dec9571085196d0f23a762f93433f22
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild
index 2299d6efc13a..1c1363dc4d9f 100644
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild
+++ b/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild,v 1.11 2012/05/29 16:28:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomeui/libgnomeui-2.24.5.ebuild,v 1.12 2014/06/24 01:12:25 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -16,18 +16,25 @@ KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbs
 IUSE="doc test"
 
 # gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-RDEPEND=">=dev-libs/libxml2-2.4.20:2
+RDEPEND="dev-libs/atk
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2.4.20:2
+	>=dev-libs/popt-1.5
+	>=gnome-base/gconf-2:2
+	>=gnome-base/gnome-keyring-0.4
+	>=gnome-base/gnome-vfs-2.7.3:2
 	>=gnome-base/libgnome-2.13.7
 	>=gnome-base/libgnomecanvas-2
+	gnome-base/libgnome-keyring
 	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/gconf-2:2
-	>=x11-libs/pango-1.1.2
-	>=dev-libs/glib-2.16:2
-	>=x11-libs/gtk+-2.14:2
-	>=gnome-base/gnome-vfs-2.7.3:2
 	>=gnome-base/libglade-2:2.0
-	>=gnome-base/gnome-keyring-0.4
-	>=dev-libs/popt-1.5"
+	media-libs/libart_lgpl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/pango-1.1.2
+	x11-libs/libICE
+	x11-libs/libSM
+"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index d8086e20b37e..0d5dbd6b040d 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,3 +1,2 @@
 DIST gnome-calculator-3.10.2.tar.xz 1086400 SHA256 2e583252e9332d8c7be52f1512a113869be1ad27fa829f7b49c89c9ea66d6d3e SHA512 f03ad5d49ee05c6acd84b9db7586bbe5086af96df8e264d48e8337bef7a0bf5289a977bd8b7a14066e4c0cba9ee9b954e44d2b77c95b5e8e08e0371ef6bddd2e WHIRLPOOL d7c6d3793adc895556e68f13e03759db19c9f9a25bf0d66760b1eb11b63f02ade6e9cab76c15cee89571a5681d74035df41cbc3b1fa93a80b0df09a2d64a2ea3
-DIST gnome-calculator-3.12.1.tar.xz 1213544 SHA256 15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740 SHA512 5cd10dd29a98014f6de88f0317de8c4cf871b065b773f3ee89ba6a30853a82e413e27e6f2f1f76e7d614d5ca31c4e4e3e52b5b5b4c6a1d33369ec54dc138e91d WHIRLPOOL 9b464d13b8b5baa38ac9cbf3c4f860f9c091cd11543b349c3f0430229ce9203e9796937ebaa316c4e3e272f71491936ce3dd4f9aec29f1080d236966b45f8251
 DIST gnome-calculator-3.12.2.tar.xz 1213444 SHA256 da9dd34286979e88430b236982bf0c8b4415cd0c0caa0c19228fb521c08abe60 SHA512 615669be101ad50a2949a711a61b3ac810de8707d450286879853bbdfde849d3246fb1f0f58a9fa15be49a54452492b9ebaf7b77436e5efbf8fb781f099e0b3d WHIRLPOOL 6dd3d8695a3cbf89cfde48e4c8404bdd95410e52d8dd8f70ef6f3a162a70df8b0e532924b106a720ca2262a6fb0332677a3845ce9ecc5a0d4296a3af9a26008a
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.12.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.12.1.ebuild
deleted file mode 100644
index e766120edb88..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.12.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-calculator/gnome-calculator-3.12.1.ebuild,v 1.1 2014/04/27 17:12:00 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://live.gnome.org/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/gtksourceview-3:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index be9bd54a2d8c..78d15240c7e0 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -1,4 +1,3 @@
 DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
 DIST gucharmap-3.10.1.tar.xz 1924628 SHA256 04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78 SHA512 d016a38dfcf61d9ad0391e7182f8f7abfb832701eb8bbabe2ba8c18c9b4fedb47624b98f8a57b07c01bc1d3a44ea1076256073a117591d73a382e4e0b505bdf5 WHIRLPOOL 2f321cd758b2ebcdcf96d2e1a315d006f0d0ec8dc8224d62e7e14859e5f224d68367f2aedd88322fe3de49a4cf29cd46cec033326dc3a11634728d5aa9d3e0cc
-DIST gucharmap-3.12.0.tar.xz 1915372 SHA256 902f02e741d7eebf919e8c6bb8936f7eafe88b4c556874c9121346c40dc55c0f SHA512 02b4e5dc3556ad00d9dbbd12519322ce1490f43956cb7ab7318255cbd7cf3e0a9267fc535f57db73829bb9cf4f6734dcc6339f9cdb4d04ebd5f8b660eab2e905 WHIRLPOOL 799cf820718de4fc8da751cd996ffc4bda420e18d5064dfc8203ae9a750b868f2125bbe72f0191e1065ec6172755f920a15a4998c060233d5145b8167f94739e
 DIST gucharmap-3.12.1.tar.xz 1918188 SHA256 5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9 SHA512 47d5a85cd6941ea5698442658d7aa91ac9e2b86b861f2fa9fd2a397caddc81c89df550cd635c5cf080bb31e7f2f0968d4bd36c23dc231799af533736fe66bf6b WHIRLPOOL cd2986dc7070f94c66a61e51db7eca7fd5c4cd7cfcb13178e05446a5ea7a240f1b4d38a9b66ccabb60503e1b2c7ff7ca748248d0a31715fe7b0c09b37bae0c92
diff --git a/gnome-extra/gucharmap/gucharmap-3.12.0.ebuild b/gnome-extra/gucharmap/gucharmap-3.12.0.ebuild
deleted file mode 100644
index 45715a589edc..000000000000
--- a/gnome-extra/gucharmap/gucharmap-3.12.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.12.0.ebuild,v 1.1 2014/04/27 17:21:20 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="http://live.gnome.org/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cjk +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.4.0:3[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
-	# dependency here for some LINGUAS.
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable cjk unihan) \
-		$(use_enable vala)
-}
diff --git a/licenses/YDSLA b/licenses/YDSLA
new file mode 100644
index 000000000000..5fe28ea9e54f
--- /dev/null
+++ b/licenses/YDSLA
@@ -0,0 +1,271 @@
+# file generated using the following command (open the link in browser for up-to-date version with html links)
+# lynx -dump http://m.legal.yandex.ru/desktop_software_agreement/?lang=en
+
+Yandex Desktop Software License Agreement
+
+   We would like to draw your attention to the fact that this License
+   Agreement shall replace the license agreements governing the use of
+   respective computer programs listed in Section 1.1 of this License
+   Agreement starting from the date indicated in the termination notices
+   in the respective license agreements. Please do consider all references
+   to those license agreements governing the use of respective computer
+   programs as references to this License Agreement.
+
+   This document is a translation of Yandex Desktop Software License
+   Agreement in English. In case of conflict between the Russian version
+   of Yandex Desktop Software License Agreement and this translation -
+   only the Russian version of Yandex Desktop Software License Agreement
+   is legally binding. The Russian version of Yandex Desktop Software
+   License Agreement can be found here:
+   http://legal.yandex.ru/desktop_software_agreement/?lang=ru.
+
+   Before using any program, please read the following terms of license
+   agreement. Any use of a program by you means full and unconditional
+   acceptance of its terms.
+
+   If you do not accept the terms of license agreement in full, you shall
+   not use it for any purpose.
+
+1. General Provisions
+
+   1.1. This License Agreement (“License”) sets forth the terms and
+   conditions for the use of the following computer programs:
+   “Yandex.Disk”, “Yandex.Disk Command Line Interface”, “Yandex.Mail” for
+   Chromium, “Yandex.Weather” for Chromium, “Yandex.Traffic” for Chromium,
+   “Yandex.Search” for Chromium, “My VK page” for Chromium, “Visual
+   Bookmarks” for Internet Explorer, “Visual Bookmarks” for Mozilla
+   Firefox, “Visual Bookmarks” for Chromium, “Yandex.Translate” for
+   Chromium, “Yandex Elements” for Internet Explorer, “Yandex Elements”
+   for Mozilla Firefox, “Browsers manager” for Windows, “Yandex.Maps” for
+   Opera, “Yandex.Fotki” for Opera, “Yandex.Mail” for Opera,
+   “Yandex.Weather” for Opera, “VKontakte for express-panel” for Opera,
+   which are distributed separately as well as a part of a “Yandex
+   Elements” software package, (any of the above programs will hereinafter
+   be referred to as “Program” and all of them together as “Programs”) and
+   is concluded between any person using the Program (“User”) and YANDEX
+   LLC, 16 Lva Tolstogo St., Moscow 119021, Russia, which is the owner of
+   the exclusive rights in Programs (“Rights Holder”).
+
+   1.2. By copying any Program or Programs, installing any of them on your
+   PC or using any Program in any manner, the User expresses his/her full
+   and unconditional agreement to all the License terms and conditions.
+
+   1.3. The use of Programs is permitted only under the terms and
+   conditions of this License. If the User does not accept the terms and
+   conditions of the License in full, the User shall not use any Program
+   for any purpose. The use of Programs with violation (non-performance)
+   of any of the terms and conditions of this License shall be prohibited.
+
+   1.4. The use of Programs under this License for personal non-commercial
+   use is free of charge. The use of Programs on terms and in the manner
+   not provided for by this License is only possible on the basis of a
+   separate agreement with the Rights Holder.
+
+   1.5. This License and all relations connected with the use of a Program
+   or all Programs are subject to applicable law of the Russian Federation
+   and any claims or lawsuits arising out of this License or the use of a
+   Program or all Programs shall be filed and considered by the court at
+   the location of the Rights Holder.
+
+   1.6. The Rights Holder may provide the User with the translation of thi
+   s License from Russian into other languages, but in case of a conflict
+   between the terms of the License in Russian and its translation, only
+   Russian-language version of this License is valid.
+
+2. Rights in Programs
+
+   2.1. The Rights Holder owns all exclusive rights in all Programs.
+
+3. License
+
+   3.1. The Rights Holder provides the User with non-transferable right to
+   use Programs free of charge, under a simple (non-exclusive) license, in
+   countries around the world in the following manner:
+
+   3.1.1. To use Programs in accordance with their direct functional
+   purpose, in order to which copy and to install (execute) them on the
+   personal computer(s) of the User. The User is entitled to install
+   Programs on an unlimited number of personal computers.
+
+   3.1.2. To copy and to distribute Programs in an unmodified form and
+   solely for non-commercial purposes (free of charge).
+
+4. Limitations
+
+   4.1. Except for use within the scope and by means directly stipulated
+   for by this License or the law of the Russian Federation, the User
+   shall not modify, decompile, disassemble, decrypt and perform other
+   actions with the object code of any Program, aimed at obtaining source
+   codes of any Program and/or information on the implementation of the
+   algorithms used in the Program, to create derivative works with the use
+   of the Program, as well as to fulfill (to allow to conduct) other use
+   of Programs, without the written consent from the Rights Holder.
+
+   4.2. The User shall not, without the written consent from the Rights
+   Holder, reproduce, distribute and make available to the public, any
+   Program and/or all Programs in any form and by any means, not directly
+   stipulated for by this License, including within the collections of
+   software products, with the offering of other programs, settings and
+   other products, regardless of purposes of such use.
+
+   4.3. Programs shall be used under the names given to them by the Rights
+   Holder. The User shall not change the name of Programs, to modify
+   and/or to remove the copyright notice or other references to the Rights
+   Holder.
+
+5. Terms of Use of Specific Functions of Programs
+
+   5.1. The User is hereby notified and agrees that if automatic sending
+   of anonymous statistics of browser usage is enabled in Programs, the
+   Rights Holder will be anonymously (without reference to the User) and
+   automatically receiving the information, including the visited site,
+   viewed pages and downloaded files for the purposes of improving the
+   quality of the products and services provided to the User, until the
+   function is switched off.
+
+   5.2. The User is hereby notified and agrees that if using the function
+   “To the exact address” for the provision of the User with the hints of
+   corrected input errors, the Rights Holder is anonymously (without
+   reference to the User) reported in the automatic mode on the characters
+   entered in the address bar of the browser, until the function is
+   switched off.
+
+   5.3. Automatic translation of texts and web pages using the function
+   “Translation of pages” is conducted using own technologies of the
+   Rights Holder, and also the technologies of the partners of the Rights
+   Holder. In case of presence of the logo of PROMT LLC on the translation
+   result page of the Program, the translation is done using technologies
+   developed by PROMT ® (http://www.promt.ru). The logs of
+   translations will be anonymously (without reference to the User) sent
+   to the Rights Holder.
+
+   5.4. The User is hereby notified and agrees that, when using the
+   translation of words function, the translation is performed using the
+   technologies developed by PROMT ® (http://www.promt.ru). The logs
+   of translations will be anonymously (without reference to the User)
+   sent to the Rights Holder.
+
+   5.5. The User is hereby notified and agrees that when using the
+   “Location identification” function in the Program, IP address of the
+   User’s computer and the data on available Wi-Fi networks will be
+   anonymously (without reference to the User) sent to the automated
+   service of location identification of the Rights Holder.
+
+   5.6. The User is hereby notified and agrees that when enabling the
+   “Smart Line” function to offer the User search tips, the Rights Holder
+   is anonymously (without reference to the User) reported in the
+   automatic mode on the characters entered in the address bar of the
+   browser, text of the tip selected by the User and identifier of the
+   system, until the function is switched off.
+
+   5.7. The User is hereby notified and agrees that if the function
+   “Quotation Index” is enabled in the Program “Yandex Elements” for
+   Internet Explorer and/or in the Program “Yandex Elements” for Mozilla
+   Firefox, the Rights Holder will be anonymously (without reference to
+   the User) and automatically receiving the information on the visited
+   site and downloaded files for the purposes of determining the quotation
+   index of the site that is being viewed by the User, until the function
+   is switched off.
+
+   5.8. The User is hereby notified and agrees that if the function
+   “Feedback” is enabled in the Program “Yandex Elements” for Internet
+   Explorer and/or in the Program “Yandex Elements” for Mozilla Firefox,
+   the Rights Holder will be anonymously (without reference to the User)
+   and automatically receiving the information on the visited site and
+   downloaded files for the purposes of determining the number of comments
+   to the site that is being viewed by the User, until the function is
+   switched off.
+
+   5.9. The User at any time can refuse to transfer the data specified in
+   clauses 5.1 – 5.8 by switching off the corresponding features.
+
+   5.10. All data on the use of Programs transferred in accordance with
+   this License, shall be stored and processed in accordance with the
+   Privacy Policy (http://legal.yandex.ru/confidential/).
+
+   5.11. By using the widget of the service "Yandex.Music" User accepts
+   Terms and Conditions service Yandex.Music
+   (http://legal.yandex.ru/music_termsofuse/).
+
+   5.12. The “Text Only” function is based on the “Readability” program,
+   the exclusive right to which owned by the company “Arc90”, which
+   distributes the “Readability” program under the Apache 2.0
+   (http://www.apache.org/licenses/LICENSE-2.0) license.
+
+   5.13. The Program “Yandex Elements” for Internet Explorer uses the
+   Compact Language Detection library included in Chromium source code
+   (http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/).
+   The specified software can be used on the terms available at:
+   http://src.chromium.org/viewvc/chrome/trunk/src/third_party/cld/LIC
+   ENSE.
+
+   5.14. The User is hereby notified and agrees that when installing the
+   Program “Yandex Elements” for Internet Explorer and/or the Program
+   “Yandex Elements” for Mozilla Firefox, additional components (buttons)
+   that are integrated with the popular social networks, e-mail services
+   and other instruments, will be automatically selected and installed,
+   while the selection is conducted completely automatically and no data
+   is transferred beyond the User’s computer.
+
+6. Limitation of Liability under the License
+
+   6.1. Programs are provided on “as is” basis. The Rights Holder shall
+   provide no warranties regarding error-free and uninterrupted operation
+   of Programs, meeting the specific goals and expectations of the User,
+   and also shall provide no other warranties not directly stated in this
+   License.
+
+   6.2. To the maximum extent permitted by the current law, the Rights
+   Holder shall not be responsible for any direct or indirect consequences
+   of any use of or inability to use Programs and/or damage inflicted on
+   the User and/or third parties as a result of any use or non-use of
+   Programs, including possible errors or failures of Programs.
+
+   6.3. The User is hereby notified and agrees that while using Programs,
+   the Rights Holder obtains anonymously (without reference to the User)
+   in automatic mode the following information: the type of operating
+   system on the User’s computer, version and identifier of the Program,
+   usage statistics of Program’s features, as well as other technical
+   information.
+
+   6.4. The User is able to add components (buttons) to the Program
+   “Yandex Elements” for Internet Explorer and/or the Program “Yandex
+   Elements” for Mozilla Firefox, which are developed and offered by third
+   parties, providing access to information or services of third parties,
+   or redirecting to the resources of third parties (“Custom Components”).
+   The User understands and agrees that the installation of Custom
+   Components to the Program is conducted at the user’s own risk. The
+   Rights Holder has no control over the performance, information,
+   services or resources accessed through such Custom Components, as well
+   as their compliance with the law, and is not responsible for the
+   results of installation or use of Custom Components. The Rights Holder
+   does not cover any damage caused to the User by the use of or inability
+   to use any Custom Components or information, services and resources
+   accessed through Custom Components.
+
+7. Updates/New Versions of Programs
+
+   7.1. Programs may automatically download and install updates from time
+   to time, which are directed to enhance Programs and which can be in the
+   form of patches, additional modules and new versions of Programs. The
+   User is hereby notified and agrees that Programs will update
+   automatically, including request, download and installation of updates
+   for Programs onto the User’s computer without further notice.
+
+   7.2. This License shall be applied to all future updates/new versions
+   of any Program or all Programs. The installation of an update/new
+   version of the respective Program shall be deemed as an acceptance of
+   the terms and conditions of this License by the User for relevant
+   updates/new versions of the Program, unless the update/installation of
+   a new version of the Program is accompanied by any other license
+   agreement.
+
+8. Changes to the Terms and Conditions of this License
+
+   8.1. This license agreement may be changed unilaterally by the Rights
+   Holder. The notification of the User on the changes in the terms and
+   conditions of this License is published on the page:
+   http://legal.yandex.ru/desktop_software_agreement/. These changes
+   in the terms and conditions of the license agreement shall be effective
+   from the date of their publication, unless otherwise is specified in
+   the relevant publication.
diff --git a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
index 0333353216cd..b775ea617834 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.3 2014/02/15 23:50:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.8.1-r1.ebuild,v 1.5 2014/06/24 02:08:52 jer Exp $
 
 EAPI=4
 inherit eutils systemd user
@@ -12,7 +12,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~x86"
 IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
 
 DEPEND=">=sys-apps/sed-4
@@ -117,7 +117,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}/amavisd.service"
 	use clamav || sed -i -e '/Wants=clamd/d' "${ED}"/usr/lib/systemd/system/amavisd.service
-	use spamassasin || sed -i -e '/Wants=spamassasin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
+	use spamassassin || sed -i -e '/Wants=spamassassin/d' "${ED}"/usr/lib/systemd/system/amavisd.service
 
 	keepdir "${AMAVIS_ROOT}"
 	keepdir "${AMAVIS_ROOT}/db"
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 483723efea3b..37e0fa338cfd 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -1 +1,2 @@
 DIST alsa-lib-1.0.27.2.tar.bz2 906844 SHA256 690ed393e7efd4fc7e3a2d2cda5449298ca0c895197e5914e350882012430d19 SHA512 3fa9160e001cf21ddc6332c3748f8aa27bd1b514616fd1a9993c34128fe99d07e2dfc5f1a9177e1c17456d1361496f90bf3552f940fd85c6ea5ac9bbc30fe8ce WHIRLPOOL d5df07a99abe4fe7842ef9fe2718148f17db0a182ef0315ec5c32e2ea20ea2a2da007f880dbc2954efc5a2d61dd5e92038a45d8172bee29d8af13532dcdd4afd
+DIST alsa-lib-1.0.28.tar.bz2 903786 SHA256 3c074b85dde1b30e78ef4995579765833e5b693fbbd8f834c335e080cb734a6d SHA512 a08430d0beb4a751b1608d148f4fc3d1077a689f5f7197b830a2768d66238b69de2614448d56643fbcb3141faa06ab361b7a8579cce4303304bce8c10de01f08 WHIRLPOOL db51ab59cfce545a4790c423a141846996d2fa2db7134b3cf17562e7e1d70bc4c56052edda9e6bfcd6f38ca9750f266bcec845b66c43402340f187a945a1098b
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
index 2eb804dec472..237daeab32fe 100644
--- a/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.13 2014/04/28 17:46:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.27.2.ebuild,v 1.14 2014/06/23 21:24:11 ssuominen Exp $
 
 EAPI=5
 
@@ -26,6 +26,8 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
 DEPEND="${RDEPEND}
 	doc? ( >=app-doc/doxygen-1.2.6 )"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild
new file mode 100644
index 000000000000..ed1e516eb1ed
--- /dev/null
+++ b/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-lib/alsa-lib-1.0.28.ebuild,v 1.3 2014/06/24 06:56:21 ssuominen Exp $
+
+EAPI=5
+
+# no support for python3_2 or above yet wrt #471326
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils multilib multilib-minimal python-single-r1
+
+DESCRIPTION="Advanced Linux Sound Architecture Library"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="alisp debug doc elibc_uclibc python"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-soundlibs-20130224-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( >=app-doc/doxygen-1.2.6 )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die
+	# http://bugs.gentoo.org/509886
+	use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; }
+	epatch_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myconf
+	# enable Python only on final ABI
+	if multilib_is_native_abi; then
+		myconf="$(use_enable python)"
+	else
+		myconf="--disable-python"
+	fi
+	use elibc_uclibc && myconf+=" --without-versioned"
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-maintainer-mode \
+		--enable-shared \
+		--disable-resmgr \
+		--enable-rawmidi \
+		--enable-seq \
+		--enable-aload \
+		$(use_with debug) \
+		$(use_enable alisp) \
+		${myconf}
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		emake doc
+		fgrep -Zrl "${S}" doc/doxygen/html | \
+			xargs -0 sed -i -e "s:${S}::"
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	if multilib_is_native_abi && use doc; then
+		dohtml -r doc/doxygen/html/.
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	find "${ED}"/usr/$(get_libdir)/alsa-lib -name '*.a' -exec rm -f {} +
+	dodoc ChangeLog doc/asoundrc.txt NOTES TODO
+}
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 495d89255541..7c481712a7f2 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1 +1,2 @@
 DIST alsa-oss-1.0.25.tar.bz2 253409 SHA256 ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3 SHA512 5380e5acf588dd56384f53afedc7704bfc5e3a7b886853061c53236f86312a8f0ca9b9adf6e69019569a3eb6fd3e89acfb715bb16101f50dcf961e84269c3cd2 WHIRLPOOL 27f19ae9b43d6941fdafb8e51ef0e7cd2667a6a6a8babf58303a0468bad02a33fd2562e91e5c92941083f7a0b2b4e17d4a001c41370bf6cddd29182b17ee4ca0
+DIST alsa-oss-1.0.28.tar.bz2 291500 SHA256 3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5 SHA512 7069b7d4d4c0b840608dcca99a660aae1f81f6ef45dcf48fc66553b05de260d033105aa685c8ca05fd4d157d12d83860746a05afdab4f310919c34fa235ab03e WHIRLPOOL 02c7dfadbd30baaf86094a0ffff996eec5bf67aed7f49dc915d29b9a0318345415a1bd9c776967e1dc9da3c9dd180169f61950fd1454fa28837e35631cb83efe
diff --git a/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
new file mode 100644
index 000000000000..186cc9324eb2
--- /dev/null
+++ b/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-1.0.28.ebuild,v 1.1 2014/06/23 22:22:13 ssuominen Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib multilib-minimal
+
+MY_P="${P/_rc/rc}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer."
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/${PN}-1.0.12-hardened.patch" )
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf $(use_enable static-libs static)
+}
+
+src_prepare() {
+	eautoreconf
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+	sed -i -e 's:\${exec_prefix}/\\$LIB/::' "${D}/usr/bin/aoss" || die
+}
diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
index 39fc8a524265..9d48456b953d 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild,v 1.15 2013/02/02 22:49:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libiptcdata/libiptcdata-1.0.4.ebuild,v 1.16 2014/06/24 03:46:01 patrick Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -76,10 +76,3 @@ src_install () {
 
 	find "${D}" -name '*.la' -delete || die "failed to remove *.la files"
 }
-
-pkg_postinst() {
-	elog "This version of ${PN} has stopped installing .la files. This may"
-	elog "cause compilation failures in other packages. To fix this problem,"
-	elog "install dev-util/lafilefixer and run:"
-	elog "  lafilefixer --justfixit"
-}
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 352d364ff0bb..d840dad35726 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1 +1,2 @@
 DIST alsa-plugins-1.0.27.tar.bz2 363593 SHA256 0bbd0c37c2dd7baf16363afb2e58169ffb0f9c0a70031b3b6235594630f3ab35 SHA512 73c2010b66022429bc664bdab1c03694dfd669260dea569e32496bc6e10a11a0da2dd87db6a661ab1376f3aa59f1df8a84cb48ff1d20bb064756c655203f9993 WHIRLPOOL 4487734e0377c880a46df6f7fa53d86a7c38fa3d4bd35e06d128c0ec2b99c789ed64674b59003d8bd0abce2db53301234e467d235532ea145ddb150919cb49af
+DIST alsa-plugins-1.0.28.tar.bz2 366023 SHA256 426f8af1a07ee9d8c06449524d1f0bd59a06e0331a51aa3d59d343a7c6d03120 SHA512 c79cf22f426f500c704c947af602604c62a76a026c9b945589d1ca83dff16de23cec2f1c29c9713e42736092aa0d0389e514ca2ca646f8e4770c8aa8320725cc WHIRLPOOL 9cb54e2a30a3f682aa23acb6317f267ffb3cd47eceb959fbce73c8db3ba7c8af420b91b91cce865f0aaf0c60b2920f51972640aff8413c871d0709fa7f4f90a6
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
new file mode 100644
index 000000000000..76e838510809
--- /dev/null
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.28.ebuild,v 1.1 2014/06/23 21:46:39 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib multilib-minimal
+
+DESCRIPTION="ALSA extra plugins"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/plugins/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="debug ffmpeg jack libsamplerate pulseaudio speex"
+
+# TODO: handle USE=ffmpeg once it is converted
+
+RDEPEND=">=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
+	ffmpeg? ( virtual/ffmpeg )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+:	epatch "${FILESDIR}"/${PN}-1.0.23-automagic.patch
+
+	epatch_user
+
+	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
+	# failed assert. As the code works just fine with asserts disabled, for now
+	# disable them waiting for a better solution.
+	sed -i \
+		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
+		pulse/Makefile.am || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	use debug || append-cppflags -DNDEBUG
+
+	local myspeex=no
+	use speex && myspeex=lib
+
+	ECONF_SOURCE=${S} \
+	econf \
+		$(multilib_native_use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
+		--with-speex=${myspeex}
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	cd doc || die
+	dodoc upmix.txt vdownmix.txt README-pcm-oss
+	use jack && dodoc README-jack
+	use libsamplerate && dodoc samplerate.txt
+	use ffmpeg && dodoc lavcrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse-default.conf
+		insinto /usr/share/alsa/alsa.conf.d
+		doins "${FILESDIR}"/51-pulseaudio-probe.conf
+		# bug #410261, comment 5+
+		# seems to work fine without any path
+		sed -i \
+			-e "s:/usr/lib/alsa-lib/::" \
+			"${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+	fi
+
+	prune_libtool_files --all
+}
+
+pkg_postinst() {
+	if use pulseaudio; then
+		einfo "The PulseAudio device is now set as the default device if the"
+		einfo "PulseAudio server is found to be running. Any custom"
+		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
+		einfo "purpose should now be unnecessary."
+	fi
+}
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 2f4f4bfabaa6..f3a0cbf765b6 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1 +1,2 @@
 DIST alsa-tools-1.0.27.tar.bz2 1650746 SHA256 6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2 SHA512 aad985329e5649b5bd7c142e95c5d1c415f28bac1afb81ad21fedac76e736d18abe4aa129e798650d91b2dd14fb18f3960ed5218768c689319c2360c432b4589 WHIRLPOOL 0d827aee4219e393c61a55920e3d66eb4e208e9d3d93ac9c1bf208c5c0c8cdf2d58f63d70b534458f3542cd3cbd5478129d73aecc57ce6654bc43f0bc73c0f25
+DIST alsa-tools-1.0.28.tar.bz2 1675680 SHA256 76e59711c6d0f39cbddce83ce1ed8da00bad112fee021f94fa990d8685cc3761 SHA512 b5150edb5f5124d5ec256b7c3348207da1bb9847ab2f10297171d6a43f559a31429ef96608a2c670db75d269dd940ebf2b6e3cbfafde530de25cbd95dce31af2 WHIRLPOOL 20f8acf8edf3fa82f19e4098c520c155a87966272d769f29a6208b25fc80a831a6cfdb3c748406ced643b5de7fa4cfb43f3a62d634fd90512369b1f57ea9cb92
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild
new file mode 100644
index 000000000000..4950d06166d5
--- /dev/null
+++ b/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.28.ebuild,v 1.2 2014/06/23 23:10:04 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Advanced Linux Sound Architecture tools"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
+alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
+alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
+alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
+
+COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
+	>=dev-python/pyalsa-1.0.26
+	fltk? ( >=x11-libs/fltk-1.3.0:1 )
+	gtk? (
+		>=dev-python/pygtk-2
+		x11-libs/gtk+:2
+		x11-libs/gtk+:3
+		)" #468294
+RDEPEND="${COMMON_DEPEND}
+	gtk? ( media-fonts/font-misc-misc )" #456114
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+
+	if use gtk; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
+		use alsa_cards_ice1712 && \
+			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
+		use alsa_cards_rme32 && use alsa_cards_rme96 && \
+			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+	fi
+
+	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
+		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
+		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	fi
+
+	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
+	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
+	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
+	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
+	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
+
+	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
+		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+
+	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
+		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+	fi
+
+	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/envy24control-config-dir.patch
+
+	epatch_user
+
+	# This block only deals with the tools that still use GTK and the
+	# AM_PATH_GTK macro.
+	for dir in echomixer envy24control rmedigicontrol; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	# This block deals with the tools that are being patched
+	for dir in hdspconf; do
+		has "${dir}" "${ALSA_TOOLS}" || continue
+		pushd "${dir}" &> /dev/null
+		eautoreconf
+		popd &> /dev/null
+	done
+
+	elibtoolize
+}
+
+src_configure() {
+	if use fltk; then
+		# hdspmixer requires fltk
+		append-ldflags "-L$(dirname $(fltk-config --libs))"
+		append-flags "-I$(fltk-config --includedir)"
+	fi
+
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		case "${f}" in
+			echomixer,envy24control,rmedigicontrol )
+				econf --with-gtk2
+				;;
+			* )
+				econf
+				;;
+		esac
+	done
+}
+
+src_compile() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		cd "${S}/${f}"
+		emake
+	done
+}
+
+src_install() {
+	local f
+	for f in ${ALSA_TOOLS}
+	do
+		# Install the main stuff
+		cd "${S}/${f}"
+		# hotplugdir is for usx2yloader/Makefile.am
+		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
+
+		# Install the text documentation
+		local doc
+		for doc in README TODO ChangeLog AUTHORS; do
+			if [[ -f "${doc}" ]]; then
+				mv "${doc}" "${doc}.$(basename ${f})" || die
+				dodoc "${doc}.$(basename ${f})"
+			fi
+		done
+	done
+
+	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
+	prune_libtool_files
+}
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index f0af509bbbbe..fe32131d6408 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1 +1,2 @@
 DIST alsa-utils-1.0.27.2.tar.bz2 1143802 SHA256 02bfac39092f3b68d743c23ad3d688d6c5aa8df69f2ccd692c5b8282edb352ea SHA512 c9a4943852ec1a71a5a8d2c99e1df0ba96a5d9d1196cabfdb6655f58c6a9a5a9d40dea62de019f5ed0fad0885800403c48a4a6c86b67af7fbd842097881c2bd6 WHIRLPOOL 9e95c37f307498bb9a7829fd721bf54888f3fe9ec78f014702cc26493e81369a44b571f1f5e65b3e32dbde926f97ab1152e22cf66fdff17be209e61ae34d9d46
+DIST alsa-utils-1.0.28.tar.bz2 1146887 SHA256 f3ff4c89b0125a7797b1b13cd094cc92276e655458274967386e812d03642acc SHA512 faa5abf3f066106c80d019944efa2298e2d3157469c1c7bc52deb9aa1bcd5f5439a2e22b04ad9210e292fcef97bdacc27aa75fc275d0d7cae2c2f88729c84786 WHIRLPOOL d58587d9f302f3f1a7ab4de45c3889ce82e5be782e4aa9a953c39a908a4693e99c8ea9aeeb5669f0f606d980983beb7d5fc53e4c76ce1bb76500c7c2bcb45013
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
new file mode 100644
index 000000000000..dc7866570146
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.28.ebuild,v 1.1 2014/06/23 21:34:42 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc +libsamplerate +ncurses nls selinux"
+
+RDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7 )
+	selinux? ( sec-policy/selinux-alsa )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myconf
+	use doc || myconf='--disable-xmlto'
+
+	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+	econf \
+		--disable-maintainer-mode \
+		$(use_enable libsamplerate alsaloop) \
+		$(use_enable nls) \
+		$(use_enable ncurses alsamixer) \
+		--disable-alsaconf \
+		"$(systemd_with_unitdir)" \
+		--with-udev-rules-dir="$(get_udevdir)"/rules.d \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog README TODO seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r6 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsasound.initd-r6 b/media-sound/alsa-utils/files/alsasound.initd-r6
new file mode 100644
index 000000000000..2eddfd308db4
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsasound.initd-r6
@@ -0,0 +1,88 @@
+#!/sbin/runscript
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound.initd-r6,v 1.1 2014/06/23 21:34:42 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+alsastatedir=/var/lib/alsa
+alsascrdir=/etc/alsa.d
+alsahomedir=/var/run/alsasound
+
+extra_commands="save restore"
+
+depend() {
+	need localmount
+	after bootmisc modules isapnp coldplug hotplug
+}
+
+restore() {
+	ebegin "Restoring Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	if [ ! -r "${alsastatedir}/asound.state" ] ; then
+		ewarn "No mixer config in ${alsastatedir}/asound.state, you have to unmute your card!"
+		eend 0
+		return 0
+	fi
+
+	local cards="$(sed -n -e 's/ *\([[:digit:]]*\) .*/\1/p' /proc/asound/cards)"
+	local CARDNUM
+	for cardnum in ${cards}; do
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		[ -e /dev/snd/controlC${cardnum} ] || sleep 2
+		alsactl -E HOME="${alsahomedir}" -I -f "${alsastatedir}/asound.state" restore ${cardnum} \
+			|| ewarn "Errors while restoring defaults, ignoring"
+	done
+
+	for ossfile in "${alsastatedir}"/oss/card*_pcm* ; do
+		[ -e "${ossfile}" ] || continue
+		# We use cat because I'm not sure if cp works properly on /proc
+		local procfile=${ossfile##${alsastatedir}/oss}
+		procfile="$(echo "${procfile}" | sed -e 's,_,/,g')"
+		if [ -e /proc/asound/"${procfile}"/oss ] ; then
+		    cat "${ossfile}" > /proc/asound/"${procfile}"/oss 
+		fi
+	done
+
+	eend 0
+}
+
+save() {
+	ebegin "Storing ALSA Mixer Levels"
+
+	checkpath -q -d -m 0700 -o root:root ${alsahomedir} || return 1
+
+	mkdir -p "${alsastatedir}"
+	if ! alsactl -E HOME="${alsahomedir}" -f "${alsastatedir}/asound.state" store; then
+		eerror "Error saving levels."
+		eend 1
+		return 1
+	fi
+
+	for ossfile in /proc/asound/card*/pcm*/oss; do
+		[ -e "${ossfile}" ] || continue
+		local device=${ossfile##/proc/asound/} ; device=${device%%/oss}
+		device="$(echo "${device}" | sed -e 's,/,_,g')"
+		mkdir -p "${alsastatedir}/oss/"
+		cp "${ossfile}" "${alsastatedir}/oss/${device}"
+	done
+
+	eend 0
+}
+
+start() {
+	if [ "${RESTORE_ON_START}" = "yes" ]; then
+		restore
+	fi
+
+	return 0
+}
+
+stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save
+	fi
+	return 0
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index c8495b662756..7144379b1b72 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 23 Jun 2014 15:37:04 +0000
+Tue, 24 Jun 2014 11:07:01 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index c8495b662756..7144379b1b72 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 23 Jun 2014 15:37:04 +0000
+Tue, 24 Jun 2014 11:07:01 +0000
diff --git a/metadata/md5-cache/app-admin/sysstat-10.3.1 b/metadata/md5-cache/app-admin/sysstat-11.0.0
similarity index 80%
rename from metadata/md5-cache/app-admin/sysstat-10.3.1
rename to metadata/md5-cache/app-admin/sysstat-11.0.0
index 1c9c1217428b..d366346e9589 100644
--- a/metadata/md5-cache/app-admin/sysstat-10.3.1
+++ b/metadata/md5-cache/app-admin/sysstat-11.0.0
@@ -4,9 +4,10 @@ DESCRIPTION=System performance tools for Linux
 EAPI=5
 HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
 IUSE=cron debug +doc isag nls lm_sensors selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=cron? ( sys-process/cronbase ) isag? ( dev-lang/tk dev-vcs/rcs sci-visualization/gnuplot ) nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
 SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-10.3.1.tar.bz2
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.0.0.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cc48dfa163b7896892c1ffbcfd70722d
+_md5_=2c1ee44b406a1f7cd6473ea8002c5fdb
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.3 b/metadata/md5-cache/app-backup/amanda-3.3.3
index ac2efd1d610f..08855e7ac8f5 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.3
+++ b/metadata/md5-cache/app-backup/amanda-3.3.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl:=[-build(-)] virtual/pkgconfig
+DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl:=[-build(-)] virtual/pkgconfig
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=5
 HOMEPAGE=http://www.amanda.org/
 IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
+RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.3.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0422e09cadb3c1f47b098fcf27a36498
+_md5_=8d956214ee17807f7a76a0495730ce0d
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.3-r1 b/metadata/md5-cache/app-backup/amanda-3.3.3-r1
index d39838b5e927..5402188162eb 100644
--- a/metadata/md5-cache/app-backup/amanda-3.3.3-r1
+++ b/metadata/md5-cache/app-backup/amanda-3.3.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl:=[-build(-)] virtual/pkgconfig
+DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl:=[-build(-)] virtual/pkgconfig
 DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
 EAPI=5
 HOMEPAGE=http://www.amanda.org/
 IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
 KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
-RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !systemd? ( virtual/inetd ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
+RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/amanda/amanda-3.3.3.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=85adb5e6cc82efafd26ba065b4aa33ab
+_md5_=3d5a82314601e446672415a2482ea66e
diff --git a/metadata/md5-cache/app-backup/amanda-3.3.5 b/metadata/md5-cache/app-backup/amanda-3.3.5
new file mode 100644
index 000000000000..9455527ef03f
--- /dev/null
+++ b/metadata/md5-cache/app-backup/amanda-3.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl:=[-build(-)] virtual/pkgconfig
+DESCRIPTION=The Advanced Maryland Automatic Network Disk Archiver
+EAPI=5
+HOMEPAGE=http://www.amanda.org/
+IUSE=curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=HPND BSD BSD-2 GPL-2+ GPL-3+
+RDEPEND=sys-libs/readline virtual/awk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( dev-perl/XML-Simple virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://sourceforge/amanda/amanda-3.3.5.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=18d00100072c58de0891cf80a1371db0
diff --git a/metadata/md5-cache/app-crypt/gnupg-1.4.17 b/metadata/md5-cache/app-crypt/gnupg-1.4.17
new file mode 100644
index 000000000000..79963358b54e
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gnupg-1.4.17
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) dev-lang/perl nls? ( sys-devel/gettext )
+DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
+EAPI=5
+HOMEPAGE=http://www.gnupg.org/
+IUSE=bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=GPL-2
+RDEPEND=!static? ( ldap? ( net-nds/openldap ) bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) curl? ( net-misc/curl ) mta? ( virtual/mta ) readline? ( sys-libs/readline ) smartcard? ( =virtual/libusb-0* ) usb? ( =virtual/libusb-0* ) ) selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnupg/gnupg/gnupg-1.4.17.tar.bz2
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=881a37f7cbd6f6c8b1a7208b308a3d3d
diff --git a/metadata/md5-cache/app-emulation/free42-1.4.77 b/metadata/md5-cache/app-emulation/free42-1.4.77
index d502da9a9b2a..ba77f6d50b9b 100644
--- a/metadata/md5-cache/app-emulation/free42-1.4.77
+++ b/metadata/md5-cache/app-emulation/free42-1.4.77
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
 DESCRIPTION=An HP-42S Calculator Simulator
-EAPI=4
+EAPI=5
 HOMEPAGE=http://thomasokken.com/free42/
 IUSE=alsa
 KEYWORDS=amd64 x86
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs
 SLOT=0
 SRC_URI=mirror://gentoo/free42-1.4.77.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=ebf1e69bf6441f1835adfbc5cb5f7d12
+_md5_=14d4e02f7bf6f37b75c21bcf639cd4de
diff --git a/metadata/md5-cache/app-emulation/free42-1.4.75 b/metadata/md5-cache/app-emulation/free42-1.5.3a
similarity index 83%
rename from metadata/md5-cache/app-emulation/free42-1.4.75
rename to metadata/md5-cache/app-emulation/free42-1.5.3a
index d66114441df6..6a7a06beeba6 100644
--- a/metadata/md5-cache/app-emulation/free42-1.4.75
+++ b/metadata/md5-cache/app-emulation/free42-1.5.3a
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
 DESCRIPTION=An HP-42S Calculator Simulator
-EAPI=4
+EAPI=5
 HOMEPAGE=http://thomasokken.com/free42/
 IUSE=alsa
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
 SLOT=0
-SRC_URI=mirror://gentoo/free42-1.4.75.tgz
+SRC_URI=mirror://gentoo/free42-1.5.3a.tgz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9637a8727fcad650a93e91cae09c5921
+_md5_=c2b8012ec8dd8835a29100096fd0f401
diff --git a/metadata/md5-cache/app-laptop/pommed-1.21-r1 b/metadata/md5-cache/app-laptop/pommed-1.21-r1
deleted file mode 100644
index 44dc41464a79..000000000000
--- a/metadata/md5-cache/app-laptop/pommed-1.21-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) virtual/pkgconfig
-DESCRIPTION=Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook
-EAPI=1
-HOMEPAGE=http://technologeek.org/projects/pommed/index.html
-IUSE=gtk X
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/2499/pommed-1.21.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b0c929b215ce7d556fc77a78eb268e18
diff --git a/metadata/md5-cache/app-laptop/pommed-1.30 b/metadata/md5-cache/app-laptop/pommed-1.30
deleted file mode 100644
index 8eea2769ca04..000000000000
--- a/metadata/md5-cache/app-laptop/pommed-1.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) virtual/pkgconfig
-DESCRIPTION=Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook
-EAPI=1
-HOMEPAGE=http://technologeek.org/projects/pommed/index.html
-IUSE=gtk X
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3159/pommed-1.30.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=fdf31e0069e304fd41e3dbd3c7dcc292
diff --git a/metadata/md5-cache/app-laptop/pommed-1.31 b/metadata/md5-cache/app-laptop/pommed-1.31
deleted file mode 100644
index 3ed0c90acd82..000000000000
--- a/metadata/md5-cache/app-laptop/pommed-1.31
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) virtual/pkgconfig
-DESCRIPTION=Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook
-EAPI=1
-HOMEPAGE=http://technologeek.org/projects/pommed/index.html
-IUSE=gtk X
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) X? ( x11-libs/libX11 x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3202/pommed-1.31.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bc087da2daecdf5335a70bd6548faa49
diff --git a/metadata/md5-cache/app-laptop/pommed-1.39 b/metadata/md5-cache/app-laptop/pommed-1.39
deleted file mode 100644
index efc470fa365e..000000000000
--- a/metadata/md5-cache/app-laptop/pommed-1.39
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) virtual/pkgconfig
-DESCRIPTION=Manage special features such as screen and keyboard backlight on Apple MacBook Pro/PowerBook
-EAPI=1
-HOMEPAGE=http://technologeek.org/projects/pommed/index.html
-IUSE=gtk X
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=media-libs/alsa-lib x86? ( sys-apps/pciutils ) amd64? ( sys-apps/pciutils ) dev-libs/confuse >=sys-apps/dbus-1.1 dev-libs/dbus-glib sys-libs/zlib media-libs/audiofile gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXpm ) media-sound/alsa-utils virtual/eject
-SLOT=0
-SRC_URI=http://alioth.debian.org/frs/download.php/3583/pommed-1.39.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0ffc0da8a71d0fd268c5ed0a89e8d49c
diff --git a/metadata/md5-cache/app-misc/evemu-1.1.0 b/metadata/md5-cache/app-misc/evemu-1.1.0
deleted file mode 100644
index 907360d7170c..000000000000
--- a/metadata/md5-cache/app-misc/evemu-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/xz-utils python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tools and bindings for kernel input event device emulation, data capture, and replay
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/evemu/evemu-1.1.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=9213b3e371e356fd3efa7eab782861ea
diff --git a/metadata/md5-cache/app-misc/evemu-1.2.0 b/metadata/md5-cache/app-misc/evemu-1.2.0
deleted file mode 100644
index 460ec11f04f2..000000000000
--- a/metadata/md5-cache/app-misc/evemu-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=app-arch/xz-utils python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Tools and bindings for kernel input event device emulation, data capture, and replay
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Evemu/
-IUSE=python static-libs python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=python? ( python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/evemu/evemu-1.2.0.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=c5d621d6ba70bf0acdcffa552010683c
diff --git a/metadata/md5-cache/app-misc/evemu-2.0.0 b/metadata/md5-cache/app-misc/evemu-2.0.0
new file mode 100644
index 000000000000..2c60f75b5e34
--- /dev/null
+++ b/metadata/md5-cache/app-misc/evemu-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/xz-utils python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) >=dev-libs/libevdev-0.5 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Tools and bindings for kernel input event device emulation, data capture, and replay
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Evemu/
+IUSE=python static-libs python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3 GPL-3
+RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) >=dev-libs/libevdev-0.5
+REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=http://www.freedesktop.org/software/evemu/evemu-2.0.0.tar.xz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=3399e0f7ecc5441b04b124cb88e2e658
diff --git a/metadata/md5-cache/app-misc/linux-logo-5.11-r3 b/metadata/md5-cache/app-misc/linux-logo-5.11-r3
index 92f4f47d7b25..c686720b5b66 100644
--- a/metadata/md5-cache/app-misc/linux-logo-5.11-r3
+++ b/metadata/md5-cache/app-misc/linux-logo-5.11-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A utility that displays an ANSI/ASCII logo and some system informati
 EAPI=5
 HOMEPAGE=http://www.deater.net/weave/vmwprod/linux_logo/
 IUSE=nls
-KEYWORDS=~amd64 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 hppa ~ia64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=http://www.deater.net/weave/vmwprod/linux_logo/linux_logo-5.11.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=6ae712051413a7cb0a5e1b9e6188534c
+_md5_=ffabc6415d7d49cca3f6f53222aff86a
diff --git a/metadata/md5-cache/dev-libs/boost-1.55.0-r1 b/metadata/md5-cache/dev-libs/boost-1.55.0-r1
index f0bdf4ac333f..0c2cf88b7006 100644
--- a/metadata/md5-cache/dev-libs/boost-1.55.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.55.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) app-arch/bzip2 sys-libs/zlib !app-admin/eselect-boost =dev-util/boost-build-1.55*
+DEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2 sys-libs/zlib !app-admin/eselect-boost =dev-util/boost-build-1.55*
 DESCRIPTION=Boost Libraries for C++
 EAPI=5
 HOMEPAGE=http://www.boost.org/
-IUSE=context debug doc icu +nls mpi python static-libs +threads tools python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+IUSE=context debug doc icu +nls mpi python static-libs +threads tools python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux
 LICENSE=Boost-1.0
-RDEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) app-arch/bzip2 sys-libs/zlib !app-admin/eselect-boost
-REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 ) )
+RDEPEND=icu? ( >=dev-libs/icu-3.6:= ) !icu? ( virtual/libiconv ) mpi? ( || ( sys-cluster/openmpi[cxx] sys-cluster/mpich2[cxx,threads] ) ) python? ( python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) app-arch/bzip2 sys-libs/zlib !app-admin/eselect-boost
+REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
 RESTRICT=test
 SLOT=0/1.55.0
 SRC_URI=mirror://sourceforge/boost/boost_1_55_0.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=c953e24da668f845a6af82e8883b8323
+_md5_=e693a98b2ba3fdc24b6fb5bc6f04ab22
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12 b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
index 28ffdc7c37de..14d6c829564b 100644
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.12
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libgit2-0.20.0 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/libgit2-0.20.0:= <dev-libs/libgit2-0.21 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Git library for GLib
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
 IUSE=python python_targets_python3_2 python_targets_python3_3
 KEYWORDS=amd64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.20.0 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
+RDEPEND=>=dev-libs/libgit2-0.20.0:= <dev-libs/libgit2-0.21 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python3_2 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.12.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=0add24bdb195e8227e5ae3ba672a983c
+_md5_=ede011ea4d49d05cb2bb306deb1a179c
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.14 b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.14
deleted file mode 100644
index e3544cc44654..000000000000
--- a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libgit2-0.21.0 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Git library for GLib
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
-IUSE=python python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/libgit2-0.21.0 >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.14.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3e8b890b5c6e8a5413bab39f95a7a8f7
diff --git a/metadata/md5-cache/dev-libs/libgit2-glib-0.0.16 b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.16
new file mode 100644
index 000000000000..880e030e1cb4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgit2-glib-0.0.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/libgit2-0.21.0:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Git library for GLib
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/Libgit2-glib
+IUSE=python python_targets_python3_2 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/libgit2-0.21.0:= >=dev-libs/glib-2.28.0:2 >=dev-libs/gobject-introspection-0.10.1 python? ( python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject:3[python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgit2-glib/0.0/libgit2-glib-0.0.16.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=31600d755cb78718f472961a4ae3ff8d
diff --git a/metadata/md5-cache/dev-libs/libpcre-7.9-r1 b/metadata/md5-cache/dev-libs/libpcre-7.9-r1
index 31dd8a959a2d..ebb224d7fcbc 100644
--- a/metadata/md5-cache/dev-libs/libpcre-7.9-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-7.9-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=Perl-compatible regular expression library
 EAPI=2
@@ -10,4 +10,4 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=3
 SRC_URI=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=d4b68d0820e6c128abf3be7b80ad34d7
+_md5_=2957d789313b23aa5e957c1124f751fb
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.02 b/metadata/md5-cache/dev-libs/libpcre-8.02
index 16cdfdafaca2..8f72ae97c0c6 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.02
+++ b/metadata/md5-cache/dev-libs/libpcre-8.02
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst prepare
+DEFINED_PHASES=configure install prepare
 DEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=Perl-compatible regular expression library
 EAPI=2
@@ -10,4 +10,4 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 SLOT=3
 SRC_URI=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.02.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1676ee2af313b8586d05c13b4dd78d9a
+_md5_=4e3264866fc74a89c6b01fda942b2736
diff --git a/metadata/md5-cache/dev-libs/qof-0.8.7 b/metadata/md5-cache/dev-libs/qof-0.8.7
new file mode 100644
index 000000000000..602ae50231ec
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/qof-0.8.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/libxml2 dev-libs/glib:2 sqlite? ( >=dev-db/sqlite-2.8.0:0 ) virtual/pkgconfig !dev-libs/qof:0 doc? ( app-doc/doxygen dev-texlive/texlive-latex ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A Query Object Framework
+EAPI=5
+HOMEPAGE=https://alioth.debian.org/projects/qof/
+IUSE=doc nls sqlite
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 dev-libs/glib:2 sqlite? ( >=dev-db/sqlite-2.8.0:0 )
+SLOT=2
+SRC_URI=mirror://debian//pool/main/q/qof/qof_0.8.7.orig.tar.gz
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=45ede71ce25e05671e00df4fb15f170d
diff --git a/metadata/md5-cache/dev-python/fabric-1.9.0 b/metadata/md5-cache/dev-python/fabric-1.9.0
index 958fc695a75e..ae088cedc4a0 100644
--- a/metadata/md5-cache/dev-python/fabric-1.9.0
+++ b/metadata/md5-cache/dev-python/fabric-1.9.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=<dev-python/paramiko-1.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( <dev-python/fudge-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A simple pythonic tool for remote execution and deployment.
 EAPI=5
 HOMEPAGE=http://fabfile.org http://pypi.python.org/pypi/Fabric
 IUSE=doc test python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=<dev-python/paramiko-1.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/F/Fabric/Fabric-1.9.0.tar.gz
 _eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cb0f9dc6b7f13b908264a675a2fbd422
+_md5_=90ee6dd997ef47fb4d913a77404a8aba
diff --git a/metadata/md5-cache/dev-python/pandas-0.13.1 b/metadata/md5-cache/dev-python/pandas-0.13.1
index 125bd2c319c1..ec8963ac3673 100644
--- a/metadata/md5-cache/dev-python/pandas-0.13.1
+++ b/metadata/md5-cache/dev-python/pandas-0.13.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/ipython[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytables[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/xlrd[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ipython[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Powerful data structures for data analysis and statistics
 EAPI=5
 HOMEPAGE=http://pandas.sourceforge.net/
-IUSE=doc examples excel html test R python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 test
+IUSE=doc examples excel html test R python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/numexpr[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/bottleneck[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytables[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytz[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] excel? ( >=dev-python/openpyxl-1.6.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/xlrd[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] || ( dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=excel? ( !python_targets_python3_2 ) doc? ( !python_targets_python3_2 ) R? ( !python_targets_python3_2 ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=dev-python/numpy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numexpr[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/bottleneck[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] excel? ( >=dev-python/openpyxl-1.6.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] || ( dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) R? ( dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=excel? ( !python_targets_python3_2 ) doc? ( !python_targets_python3_2 ) R? ( !python_targets_python3_2 ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pandas/pandas-0.13.1.tar.gz
 _eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3d697ba199f5c1ad56b9ba7f3c3b7234
+_md5_=fba0c7f285496e17c42e814d0203875f
diff --git a/metadata/md5-cache/dev-python/pandas-0.14.0 b/metadata/md5-cache/dev-python/pandas-0.14.0
new file mode 100644
index 000000000000..80bc2cb5b1eb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-0.14.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] doc? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/rpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/sphinx-1.2.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scikits_timeseries[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xclip ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=5
+HOMEPAGE=http://pandas.sourceforge.net/
+IUSE=doc examples excel html test R python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/python-dateutil-2.0[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/numexpr[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/bottleneck[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] excel? ( >=dev-python/openpyxl-1.6.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/xlrd[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/xlwt[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) html? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] || ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/html5lib[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] ) ) R? ( dev-python/rpy[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_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=excel? ( !python_targets_python3_2 ) doc? ( !python_targets_python3_2 ) R? ( !python_targets_python3_2 ) || ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pandas/pandas-0.14.0.tar.gz
+_eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=46166ef68f05d84e9be7985386566c70
diff --git a/metadata/md5-cache/dev-python/pymongo-2.7.1 b/metadata/md5-cache/dev-python/pymongo-2.7.1
index 93e80b4813db..14ff92fff96d 100644
--- a/metadata/md5-cache/dev-python/pymongo-2.7.1
+++ b/metadata/md5-cache/dev-python/pymongo-2.7.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-db/mongodb dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) kerberos? ( dev-python/pykerberos ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DEPEND=dev-db/mongodb dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) kerberos? ( dev-python/pykerberos ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 DESCRIPTION=Python driver for MongoDB
 EAPI=5
 HOMEPAGE=http://github.com/mongodb/mongo-python-driver http://pypi.python.org/pypi/pymongo
-IUSE=doc kerberos test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+IUSE=doc kerberos test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-db/mongodb python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+RDEPEND=dev-db/mongodb python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pymongo/pymongo-2.7.1.tar.gz
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=8bfed6b7ee30dd1a4b5d2d840fab010a
+_md5_=a9ad53e2759ac0d733eec5175dc3c687
diff --git a/metadata/md5-cache/dev-python/rpy-2.4.2 b/metadata/md5-cache/dev-python/rpy-2.4.2
new file mode 100644
index 000000000000..e472c6c434b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rpy-2.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-lang/R-3 dev-python/numpy[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/pandas-0.13[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[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) dev-lang/python-exec:=[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=Python interface to the R Programming Language
+EAPI=5
+HOMEPAGE=http://rpy.sourceforge.net/ https://pypi.python.org/pypi/rpy2
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=AGPL-3 GPL-2 LGPL-2.1 MPL-1.1
+RDEPEND=>=dev-lang/R-3 dev-python/numpy[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[sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) dev-lang/python-exec:=[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/r/rpy2/rpy2-2.4.2.tar.gz
+_eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8198aae811cfe96563dc743ce4517ae9
diff --git a/metadata/md5-cache/dev-python/setuptools-5.2 b/metadata/md5-cache/dev-python/setuptools-5.2
new file mode 100644
index 000000000000..b6dfd483c5f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-5.2
@@ -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 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=a collection of extensions to Distutils
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/setuptools
+IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+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=PSF-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) 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:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools/setuptools-5.2.tar.gz
+_eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d29d593cb711a939d36a19ecf896edd6
diff --git a/metadata/md5-cache/dev-python/tox-1.6.1 b/metadata/md5-cache/dev-python/tox-1.6.1
deleted file mode 100644
index 8758860a9bb6..000000000000
--- a/metadata/md5-cache/dev-python/tox-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/setuptools >=dev-python/virtualenv-1.8.4 dev-python/pip dev-python/pytest >=dev-python/py-1.4.9 virtual/python-argparse doc? ( dev-python/sphinx ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=4
-HOMEPAGE=http://tox.testrun.org http://pypi.python.org/pypi/tox
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools >=dev-python/virtualenv-1.8.4 dev-python/pip dev-python/pytest >=dev-python/py-1.4.9 virtual/python-argparse || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/t/tox/tox-1.6.1.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=5dea8afc549bdc5d5c8bd2f1e795e4af
diff --git a/metadata/md5-cache/dev-python/tox-1.7.0 b/metadata/md5-cache/dev-python/tox-1.7.0
deleted file mode 100644
index 0178fb25f78d..000000000000
--- a/metadata/md5-cache/dev-python/tox-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/virtualenv-1.11[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pip[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/py-1.4.17[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=5
-HOMEPAGE=http://tox.testrun.org http://pypi.python.org/pypi/tox
-IUSE=doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/virtualenv-1.11[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pip[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pytest[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/py-1.4.17[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://pypi/t/tox/tox-1.7.0.tar.gz
-_eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=08d75cb9d15c2b8c358158a3290962ae
diff --git a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2 b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
index 1bc19a92e6fc..418841840aca 100644
--- a/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
+++ b/metadata/md5-cache/dev-ruby/rexical-1.0.5-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Rexical is a lexical scanner generator
 EAPI=5
 HOMEPAGE=http://github.com/tenderlove/rexical/tree/master
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby 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=LGPL-2
 RDEPEND=!!app-admin/rex ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
 SLOT=0
 SRC_URI=mirror://rubygems/rexical-1.0.5.gem
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=bd7e33397821f3d1f10703f33d38de01
+_md5_=e534322a0d3067e695b4f5f31c7aa9e5
diff --git a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1 b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
index 7f4700a9139d..098e9006a4f5 100644
--- a/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
+++ b/metadata/md5-cache/dev-ruby/shoulda-3.5.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby19] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) )
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby19] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby20] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
 DESCRIPTION=Making tests easy on the fingers and eyes
 EAPI=5
 HOMEPAGE=http://thoughtbot.com/projects/shoulda
-IUSE=test elibc_FreeBSD ruby_targets_ruby19 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 test test
 KEYWORDS=~amd64 ~arm
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby19] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby19] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/shoulda-context-1.0.1[ruby_targets_ruby20] >=dev-ruby/shoulda-matchers-1.4.1[ruby_targets_ruby20] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 RESTRICT=test
 SLOT=3
 SRC_URI=https://github.com/thoughtbot/shoulda/archive/v3.5.0.tar.gz -> shoulda-3.5.0.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=cc730708599b1a6afaf89653d08de0e9
+_md5_=1541fd9e7c54620410af433f7c195884
diff --git a/metadata/md5-cache/dev-ruby/ttfunk-1.2.0 b/metadata/md5-cache/dev-ruby/ttfunk-1.2.0
new file mode 100644
index 000000000000..78bcd1c621be
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ttfunk-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=A TrueType font parser written in pure ruby.
+EAPI=5
+HOMEPAGE=https://github.com/prawnpdf/ttfunk/
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby test test
+KEYWORDS=~amd64
+LICENSE=|| ( GPL-2 GPL-3 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_jruby? ( dev-java/jruby ) 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_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_jruby )
+SLOT=1.2
+SRC_URI=https://github.com/prawnpdf/ttfunk/archive/1.2.0.tar.gz -> ttfunk-1.2.0.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=1fe4d8e84d647d271ce7b25c15db70f7
diff --git a/metadata/md5-cache/dev-util/abi-compliance-checker-1.99.9 b/metadata/md5-cache/dev-util/abi-compliance-checker-1.99.9
new file mode 100644
index 000000000000..2c664780f02b
--- /dev/null
+++ b/metadata/md5-cache/dev-util/abi-compliance-checker-1.99.9
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=A tool for checking backward compatibility of a C/C++ library
+EAPI=5
+HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/lvc/abi-compliance-checker/archive/1.99.9.tar.gz -> abi-compliance-checker-1.99.9.tar.gz
+_md5_=16356776457a4f6d2e1b6a86d9fc8373
diff --git a/metadata/md5-cache/dev-util/abi-compliance-checker-9999 b/metadata/md5-cache/dev-util/abi-compliance-checker-9999
index 3b6b2ee8329a..b9db31044bc3 100644
--- a/metadata/md5-cache/dev-util/abi-compliance-checker-9999
+++ b/metadata/md5-cache/dev-util/abi-compliance-checker-9999
@@ -6,4 +6,4 @@ HOMEPAGE=http://ispras.linuxbase.org/index.php/ABI_compliance_checker
 LICENSE=GPL-2
 SLOT=0
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=0e9af84b4b5370e2202ffee6f66cd39c
+_md5_=12e65555563340abd22c9597203a5e3f
diff --git a/metadata/md5-cache/dev-util/android-studio-0.6.1.135.1224218 b/metadata/md5-cache/dev-util/android-studio-0.6.1.135.1224218
new file mode 100644
index 000000000000..10eb02a768ef
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-0.6.1.135.1224218
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/zip
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=5
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.6
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://dl.google.com/dl/android/studio/ide-zips/0.6.1/android-studio-ide-135.1224218-linux.zip
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=9140877955f3df59ec145a39b90da501
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.1.5 b/metadata/md5-cache/dev-vcs/git-1.8.1.5
index f3f43e40316d..d4efc4058adc 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.1.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.1.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* )
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* )
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.1.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.1.5.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=608d539c1ccc766aaf6f3e0bea053c2b
+_md5_=817083d4713aeb95bbaa5e0a1355861f
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.1.5-r1 b/metadata/md5-cache/dev-vcs/git-1.8.1.5-r1
index d227ac2bcaaa..93698df187fe 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.1.5-r1
+++ b/metadata/md5-cache/dev-vcs/git-1.8.1.5-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.1.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.1.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.1.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.1.5.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python	be9965681d83c3980660a2660ac95e95	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=ab3cddcd6a14f84fa4a65b85958b9ae7
+_md5_=133140f301a47816644b48d3b8179061
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.2.1 b/metadata/md5-cache/dev-vcs/git-1.8.2.1
index cb1390ac1d18..1cda17d58d4d 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.2.1
+++ b/metadata/md5-cache/dev-vcs/git-1.8.2.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) python? ( =dev-lang/python-2* ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=4
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8 dev-python/pygtksourceview:2 ) ) python? ( =dev-lang/python-2* )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.2.1.tar.gz mirror://kernel/software/scm/git/git-1.8.2.1.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.2.1.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.2.1.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.2.1.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.2.1.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python	be9965681d83c3980660a2660ac95e95	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=d685a61bab4291185ff75a254b64bf52
+_md5_=7c8a17f34fa40c1db96bf06776ed7a1a
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1 b/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1
index 5e060f6363a4..5e19cb60ad14 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1
+++ b/metadata/md5-cache/dev-vcs/git-1.8.3.2-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.3.2.tar.gz mirror://kernel/software/scm/git/git-1.8.3.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.3.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.3.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.3.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.3.2.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=3922553374344625bd3a0d25df6c9080
+_md5_=702106531ad6c88ff2588b8a6d560d59
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.4.5 b/metadata/md5-cache/dev-vcs/git-1.8.4.5
index 8f8ce8744566..c6786f28ef27 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.4.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.4.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.4.5.tar.gz mirror://kernel/software/scm/git/git-1.8.4.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.4.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.4.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.4.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.4.5.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=bea60ec9da5a6c533d6fb9c0669f2020
+_md5_=857e440cb769452b655629bde769ad62
diff --git a/metadata/md5-cache/dev-vcs/git-1.8.5.5 b/metadata/md5-cache/dev-vcs/git-1.8.5.5
index 17a1d8a331ab..073b0f9c3d87 100644
--- a/metadata/md5-cache/dev-vcs/git-1.8.5.5
+++ b/metadata/md5-cache/dev-vcs/git-1.8.5.5
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-manpages-1.8.5.5.tar.gz mirror://kernel/software/scm/git/git-manpages-1.8.5.5.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.8.5.5.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.8.5.5.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=e41d5b2b77618173912a59edd25895b0
+_md5_=fa4396746ff4ebc3d3a089b0e5d2410c
diff --git a/metadata/md5-cache/dev-vcs/git-1.9.2 b/metadata/md5-cache/dev-vcs/git-1.9.2
index 0f92c2bdbabf..3da145c17294 100644
--- a/metadata/md5-cache/dev-vcs/git-1.9.2
+++ b/metadata/md5-cache/dev-vcs/git-1.9.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.9.2.tar.gz mirror://kernel/software/scm/git/git-1.9.2.tar.gz http://git-core.googlecode.com/files/git-manpages-1.9.2.tar.gz mirror://kernel/software/scm/git/git-manpages-1.9.2.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.9.2.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.9.2.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=ac271f4b822891ea3b784e6215898cd9
+_md5_=055b4436bc0e7f2485c43c8b36923b03
diff --git a/metadata/md5-cache/dev-vcs/git-1.9.3 b/metadata/md5-cache/dev-vcs/git-1.9.3
index d8b9367dcc2a..b9ab1899a0e1 100644
--- a/metadata/md5-cache/dev-vcs/git-1.9.3
+++ b/metadata/md5-cache/dev-vcs/git-1.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-1.9.3.tar.gz mirror://kernel/software/scm/git/git-1.9.3.tar.gz http://git-core.googlecode.com/files/git-manpages-1.9.3.tar.gz mirror://kernel/software/scm/git/git-manpages-1.9.3.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-1.9.3.tar.gz http://git-core.googlecode.com/files/git-htmldocs-1.9.3.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=6b5898f641aab318e821f771ca897fc0
+_md5_=f8650e985915efb94c9c7757966aa9cf
diff --git a/metadata/md5-cache/dev-vcs/git-2.0.0 b/metadata/md5-cache/dev-vcs/git-2.0.0
index 3a5bfbe03209..82887712a1d3 100644
--- a/metadata/md5-cache/dev-vcs/git-2.0.0
+++ b/metadata/md5-cache/dev-vcs/git-2.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-2.0.0.tar.gz mirror://kernel/software/scm/git/git-2.0.0.tar.gz http://git-core.googlecode.com/files/git-manpages-2.0.0.tar.gz mirror://kernel/software/scm/git/git-manpages-2.0.0.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.0.tar.gz http://git-core.googlecode.com/files/git-htmldocs-2.0.0.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=2093a4ab306477db6d86d4228e1c6c1f
+_md5_=6ea219f2bf6754f86634bec2c8e39e9f
diff --git a/metadata/md5-cache/dev-vcs/git-2.0.0-r1 b/metadata/md5-cache/dev-vcs/git-2.0.0-r1
index f5685e4c7844..053b4f38f7fd 100644
--- a/metadata/md5-cache/dev-vcs/git-2.0.0-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.0.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=http://git-core.googlecode.com/files/git-2.0.0.tar.gz mirror://kernel/software/scm/git/git-2.0.0.tar.gz http://git-core.googlecode.com/files/git-manpages-2.0.0.tar.gz mirror://kernel/software/scm/git/git-manpages-2.0.0.tar.gz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.0.0.tar.gz http://git-core.googlecode.com/files/git-htmldocs-2.0.0.tar.gz )
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=c79b4f02559de97c1be3c7723402aa22
+_md5_=f9e6f86033d50e627fac52956d05f51a
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 121c3e084f21..69dbfd8a7747 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=8b9c74f938b56377b1010124f5c19ddd
+_md5_=325887ab926ea6c821b8d5a6e6538238
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 6d635340cf7f..5e3c09b9108b 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=a825638977dee043a2b4efea2c51053c
+_md5_=b13b2f015d550fa60f2462393efec0b7
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 9231f7473132..acb3ccd23291 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=cdff103c6c65732cc65ca75e604fc7c9
+_md5_=aae681502ff56f995a49fa317f50bfd4
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 5ba98a1aaedf..32182ce3c630 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
+DEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) app-arch/cpio doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) app-text/asciidoc virtual/pkgconfig dev-vcs/git
 DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
 EAPI=5
 HOMEPAGE=http://www.git-scm.com/
 IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/gnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
+RDEPEND=dev-libs/openssl sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( virtual/perl-CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) python_single_target_python2_6? ( >=dev-lang/python-2.6.8-r3:2.6 ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] )
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_single_target_python2_6? ( python_targets_python2_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_6 python_single_target_python2_7 ) )
 SLOT=0
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=c56838c33c127fe3cd7508a1c09e386e
+_md5_=48350e2db2e02d7fa2bec6314510423d
diff --git a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5 b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5
index 9c8953076750..012ca14d8fa4 100644
--- a/metadata/md5-cache/gnome-base/libgnomeui-2.24.5
+++ b/metadata/md5-cache/gnome-base/libgnomeui-2.24.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libxml2-2.4.20:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 >=gnome-base/libbonoboui-2.13.1 >=gnome-base/gconf-2:2 >=x11-libs/pango-1.1.2 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libglade-2:2.0 >=gnome-base/gnome-keyring-0.4 >=dev-libs/popt-1.5 sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
+DEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4
 DESCRIPTION=User Interface routines for Gnome
 EAPI=3
 HOMEPAGE=http://library.gnome.org/devel/libgnomeui/stable/
@@ -7,8 +7,8 @@ IUSE=doc test
 KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2
 PDEPEND=x11-themes/gnome-icon-theme
-RDEPEND=>=dev-libs/libxml2-2.4.20:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 >=gnome-base/libbonoboui-2.13.1 >=gnome-base/gconf-2:2 >=x11-libs/pango-1.1.2 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libglade-2:2.0 >=gnome-base/gnome-keyring-0.4 >=dev-libs/popt-1.5
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.5.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=536819e95bad9c082e3b07b78dc02247
+_md5_=5100529cc44a7bc2b610ea8e3e5c9eee
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-3.12.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-3.12.1
deleted file mode 100644
index 35fddfad487f..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-3.12.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/gtksourceview-3:3.0 >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A calculator application for GNOME
-EAPI=5
-HOMEPAGE=https://live.gnome.org/Calculator
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/gtksourceview-3:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-calculator/3.12/gnome-calculator-3.12.1.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=63627e9d7ed468005e88b064adf7fcaa
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-3.12.0 b/metadata/md5-cache/gnome-extra/gucharmap-3.12.0
deleted file mode 100644
index ebc6b5cc47e8..000000000000
--- a/metadata/md5-cache/gnome-extra/gucharmap-3.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.24[vapigen] dev-lang/vala:0.22[vapigen] dev-lang/vala:0.20[vapigen] dev-lang/vala:0.18[vapigen] dev-lang/vala:0.16[vapigen] ) ) app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=Unicode character map viewer and library
-EAPI=5
-HOMEPAGE=http://live.gnome.org/Gucharmap
-IUSE=cjk +introspection test vala debug
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.4.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) !<gnome-extra/gucharmap-3:0
-REQUIRED_USE=vala? ( introspection )
-SLOT=2.90
-SRC_URI=mirror://gnome/sources/gucharmap/3.12/gucharmap-3.12.0.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vala	d8f392783fdc2395fc64af046f2ca961	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=f9676b8b198e0aa02e1fd164add37a03
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1 b/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
index 64afbb421359..319fca15ce73 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.8.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers.
 EAPI=4
 HOMEPAGE=http://www.ijs.si/software/amavisd/
 IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.8.2 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/freeze app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 dev-perl/Convert-TNEF >=dev-perl/Convert-UUlib-1.08 virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/net-server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy dev-perl/IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog sys-apps/file >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin ) zmq? ( dev-perl/ZMQ-LibZMQ2 )
 SLOT=0
 SRC_URI=http://www.ijs.si/software/amavisd/amavisd-new-2.8.1.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2810bccf73833c74a0943878ed08e067
+_md5_=88663722f874fef808813e2b7b78658b
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
index 9151efb32bef..e5e95c0ede6c 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
@@ -7,7 +7,8 @@ IUSE=doc debug alisp python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_m
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.2.tar.bz2
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b8f7f264d5f056f51f2792d683a27877
+_md5_=d707846245e569387474175338995baf
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.28 b/metadata/md5-cache/media-libs/alsa-lib-1.0.28
new file mode 100644
index 000000000000..60dcfe071e0c
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.28
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) doc? ( >=app-doc/doxygen-1.2.6 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Advanced Linux Sound Architecture Library
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=alisp debug doc elibc_uclibc python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+REQUIRED_USE=python? ( python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 ) )
+SLOT=0
+SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.28.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=de5abff9dcb0912ae549c80ef7eda803
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.0.28 b/metadata/md5-cache/media-libs/alsa-oss-1.0.28
new file mode 100644
index 000000000000..752c7b6578d2
--- /dev/null
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/alsa-lib-1.0.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Advanced Linux Sound Architecture OSS compatibility layer.
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.0.28[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
+SLOT=0
+SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.0.28.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=2d605f1f9f3cc8fce79356c02b4daa42
diff --git a/metadata/md5-cache/media-libs/libiptcdata-1.0.4 b/metadata/md5-cache/media-libs/libiptcdata-1.0.4
index f1ceac2f727d..d22343d68c82 100644
--- a/metadata/md5-cache/media-libs/libiptcdata-1.0.4
+++ b/metadata/md5-cache/media-libs/libiptcdata-1.0.4
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
+DEFINED_PHASES=compile configure install prepare setup
 DEPEND=python? ( =dev-lang/python-2* ) nls? ( virtual/libintl ) nls? ( >=sys-devel/gettext-0.13.1 ) doc? ( >=dev-util/gtk-doc-1 )
 DESCRIPTION=library for manipulating the International Press Telecommunications Council (IPTC) metadata
 EAPI=3
@@ -10,4 +10,4 @@ RDEPEND=python? ( =dev-lang/python-2* ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libiptcdata/libiptcdata-1.0.4.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b999cbcaca35f3d8da902a2ed0022774
+_md5_=40703721207282aa3d22f11c1375f1d2
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28
new file mode 100644
index 000000000000..f9c5275cda30
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=media-libs/alsa-lib-1.0.28:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=ALSA extra plugins
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=debug ffmpeg jack libsamplerate pulseaudio speex abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=media-libs/alsa-lib-1.0.28:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
+SLOT=0
+SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.28.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=aa868c331cdebd204f8fba8a74059902
diff --git a/metadata/md5-cache/media-sound/alsa-tools-1.0.28 b/metadata/md5-cache/media-sound/alsa-tools-1.0.28
new file mode 100644
index 000000000000..3cb5df11bd74
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-tools-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=media-libs/alsa-lib-1.0.28 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Advanced Linux Sound Architecture tools
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712 alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr
+KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.0.28 >=dev-python/pyalsa-1.0.26 fltk? ( >=x11-libs/fltk-1.3.0:1 ) gtk? ( >=dev-python/pygtk-2 x11-libs/gtk+:2 x11-libs/gtk+:3 ) gtk? ( media-fonts/font-misc-misc )
+SLOT=0.9
+SRC_URI=mirror://alsaproject/tools/alsa-tools-1.0.28.tar.bz2
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=bef5d2fb4cddf1fe31a56bb956af26f6
diff --git a/metadata/md5-cache/media-sound/alsa-utils-1.0.28 b/metadata/md5-cache/media-sound/alsa-utils-1.0.28
new file mode 100644
index 000000000000..2373510b76c0
--- /dev/null
+++ b/metadata/md5-cache/media-sound/alsa-utils-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=media-libs/alsa-lib-1.0.28 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7 ) selinux? ( sec-policy/selinux-alsa ) virtual/pkgconfig doc? ( app-text/xmlto ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=doc +libsamplerate +ncurses nls selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/alsa-lib-1.0.28 libsamplerate? ( media-libs/libsamplerate ) ncurses? ( >=sys-libs/ncurses-5.7-r7 ) selinux? ( sec-policy/selinux-alsa )
+SLOT=0.9
+SRC_URI=mirror://alsaproject/utils/alsa-utils-1.0.28.tar.bz2
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=680184afec87f43061d9435e86c04227
diff --git a/metadata/md5-cache/net-analyzer/alive-2.0.2 b/metadata/md5-cache/net-analyzer/alive-2.0.2
index fdc18e8f8d09..698ea22bde69 100644
--- a/metadata/md5-cache/net-analyzer/alive-2.0.2
+++ b/metadata/md5-cache/net-analyzer/alive-2.0.2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=-
-DEPEND=app-arch/xz-utils
+DEFINED_PHASES=prepare
+DEPEND=app-arch/xz-utils net-misc/iputils !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=a periodic ping program
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/alive/
@@ -8,4 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-scheme/guile net-misc/iputils
 SLOT=0
 SRC_URI=mirror://gnu/alive/alive-2.0.2.tar.xz
-_md5_=17b52d66281ef0960b7d9d4072cf2eaf
+_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=272321aff75f61693928137251deb2bc
diff --git a/metadata/md5-cache/net-analyzer/symon-2.85 b/metadata/md5-cache/net-analyzer/symon-2.85
deleted file mode 100644
index 59c954b84e84..000000000000
--- a/metadata/md5-cache/net-analyzer/symon-2.85
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) virtual/pmake || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Performance and information monitoring tool
-EAPI=4
-HOMEPAGE=http://www.xs4all.nl/~wpd/symon/
-IUSE=perl +symon symux
-KEYWORDS=~amd64 ~sparc ~x86
-LICENSE=BSD-2
-RDEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~wpd/symon/philes/symon-2.85.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=94fa330118739a5466e967913ba28403
diff --git a/metadata/md5-cache/net-analyzer/symon-2.86 b/metadata/md5-cache/net-analyzer/symon-2.86-r1
similarity index 95%
rename from metadata/md5-cache/net-analyzer/symon-2.86
rename to metadata/md5-cache/net-analyzer/symon-2.86-r1
index f6088712cf32..61268dc91ae8 100644
--- a/metadata/md5-cache/net-analyzer/symon-2.86
+++ b/metadata/md5-cache/net-analyzer/symon-2.86-r1
@@ -10,4 +10,4 @@ RDEPEND=perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) dev-lang/perl:=[
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~wpd/symon/philes/symon-2.86.tar.gz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	perl-module	a6a2d5c77bdaeba2794b167689cafb7a	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=76983480a46d684047cdb37991d38b28
+_md5_=6853335cf14ad6606617335dd7efcfba
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-0.49-r1 b/metadata/md5-cache/net-ftp/tftp-hpa-0.49-r1
index d114b36caf1b..d28244ca63b2 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-0.49-r1
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-0.49-r1
@@ -4,8 +4,8 @@ DESCRIPTION=port of the OpenBSD TFTP server
 HOMEPAGE=http://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD-4
 RDEPEND=selinux? ( sec-policy/selinux-tftp ) !net-ftp/atftp !net-ftp/netkit-tftp
 SLOT=0
 SRC_URI=mirror://kernel/software/network/tftp/tftp-hpa-0.49.tar.bz2
-_md5_=dbcf5d6d1dbabd14373e8076c574dc2d
+_md5_=5eda5b71e62c4a894d514ddc8174dbab
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-5.0 b/metadata/md5-cache/net-ftp/tftp-hpa-5.0
index c46ddde58296..76a82df794fb 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.0
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.0
@@ -4,8 +4,8 @@ DESCRIPTION=port of the OpenBSD TFTP server
 HOMEPAGE=http://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD-4
 RDEPEND=selinux? ( sec-policy/selinux-tftp ) !net-ftp/atftp !net-ftp/netkit-tftp
 SLOT=0
 SRC_URI=mirror://kernel/software/network/tftp/tftp-hpa-5.0.tar.bz2
-_md5_=ab81314b6578479e16b6bdd46a334c53
+_md5_=326ffaa341209e9c68fc2806e4807d04
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-5.1 b/metadata/md5-cache/net-ftp/tftp-hpa-5.1
index 7768d72f5f7e..ff4bdffdbd09 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.1
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.1
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
+LICENSE=BSD-4
 RDEPEND=selinux? ( sec-policy/selinux-tftp ) readline? ( sys-libs/readline ) tcpd? ( sys-apps/tcp-wrappers ) !net-ftp/atftp !net-ftp/netkit-tftp
 SLOT=0
 SRC_URI=mirror://kernel/software/network/tftp/tftp-hpa/tftp-hpa-5.1.tar.xz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=09c013dfafb95d74b3be067c22929954
+_md5_=eef9419c0f008258cb14b7131ada2776
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-5.2 b/metadata/md5-cache/net-ftp/tftp-hpa-5.2
index 4e9d19fc3d45..43c58ab2c918 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.2
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.2
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos
-LICENSE=BSD
+LICENSE=BSD-4
 RDEPEND=selinux? ( sec-policy/selinux-tftp ) readline? ( sys-libs/readline ) tcpd? ( sys-apps/tcp-wrappers ) !net-ftp/atftp !net-ftp/netkit-tftp
 SLOT=0
 SRC_URI=mirror://kernel/software/network/tftp/tftp-hpa/tftp-hpa-5.2.tar.xz
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=2185f65ef0f96850bd13ceb18ce4879a
+_md5_=c1bd345d16aee2bdfade2efef7a6ccb3
diff --git a/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r1 b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r1
index 160e8e4e4fee..f7c5ce739cc5 100644
--- a/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r1
+++ b/metadata/md5-cache/net-ftp/tftp-hpa-5.2-r1
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.kernel.org/pub/software/network/tftp/
 IUSE=ipv6 readline selinux tcpd
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos
-LICENSE=BSD
+LICENSE=BSD-4
 RDEPEND=selinux? ( sec-policy/selinux-tftp ) readline? ( sys-libs/readline ) tcpd? ( sys-apps/tcp-wrappers ) !net-ftp/atftp !net-ftp/netkit-tftp
 SLOT=0
 SRC_URI=mirror://kernel/software/network/tftp/tftp-hpa/tftp-hpa-5.2.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=cf6c516e4dcf3898d7f5e3ee4210f30f
+_md5_=d7e63bd4931bcdd033a399b4288e2dea
diff --git a/metadata/md5-cache/net-mail/imapsync-1.569 b/metadata/md5-cache/net-mail/imapsync-1.569
deleted file mode 100644
index 9f2fdbd21e60..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.569
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive imap transfer from one mailbox to another
-EAPI=5
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/IO-Socket-SSL dev-perl/Mail-IMAPClient dev-perl/TermReadKey virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.569.tgz
-_md5_=4b5452d8e7022441e1d2f84df67df5f6
diff --git a/metadata/md5-cache/net-mail/imapsync-1.580 b/metadata/md5-cache/net-mail/imapsync-1.580
deleted file mode 100644
index c72ab56cceff..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.580
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive imap transfer from one mailbox to another
-EAPI=5
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/IO-Socket-SSL dev-perl/Mail-IMAPClient dev-perl/TermReadKey virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.580.tgz
-_md5_=86ba77661c6b3aade3c77f19bb751e0d
diff --git a/metadata/md5-cache/net-mail/imapsync-1.584 b/metadata/md5-cache/net-mail/imapsync-1.584
deleted file mode 100644
index c47afe25cbc5..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.584
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=A tool allowing incremental and recursive imap transfer from one mailbox to another
-EAPI=5
-HOMEPAGE=http://ks.lamiral.info/imapsync/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/IO-Socket-SSL dev-perl/Mail-IMAPClient dev-perl/TermReadKey virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.584.tgz
-_md5_=32f69c4693919b867b584998569f3e32
diff --git a/metadata/md5-cache/net-mail/imapsync-1.592 b/metadata/md5-cache/net-mail/imapsync-1.592-r1
similarity index 68%
rename from metadata/md5-cache/net-mail/imapsync-1.592
rename to metadata/md5-cache/net-mail/imapsync-1.592-r1
index b5c7654ba184..a3c4474fb40d 100644
--- a/metadata/md5-cache/net-mail/imapsync-1.592
+++ b/metadata/md5-cache/net-mail/imapsync-1.592-r1
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://ks.lamiral.info/imapsync/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=WTFPL-2
-RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/File-Copy-Recursive dev-perl/IO-Socket-SSL dev-perl/Mail-IMAPClient dev-perl/TermReadKey virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
+RDEPEND=dev-lang/perl dev-perl/Digest-HMAC dev-perl/File-Copy-Recursive dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/Mail-IMAPClient dev-perl/TermReadKey virtual/perl-Digest-MD5 virtual/perl-MIME-Base64
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/imapsync/imapsync-1.592.tgz
-_md5_=ef92a24b57391bc8e58801bc18631560
+_md5_=52a1307f78ba1d0031368394e8550986
diff --git a/metadata/md5-cache/net-misc/mikutter-0.2.2.1537 b/metadata/md5-cache/net-misc/mikutter-0.2.2.1537
deleted file mode 100644
index 8d20c3a02d1d..000000000000
--- a/metadata/md5-cache/net-misc/mikutter-0.2.2.1537
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] dev-ruby/bsearch[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/json_pure[ruby_targets_ruby19] dev-ruby/memoize[ruby_targets_ruby19] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby19] dev-ruby/ruby-hmac[ruby_targets_ruby19] dev-ruby/typed-array[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-DESCRIPTION=mikutter is simple, powerful and moeful twitter client
-EAPI=5
-HOMEPAGE=http://mikutter.hachune.net/
-IUSE=+libnotify sound test elibc_FreeBSD ruby_targets_ruby19
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] dev-ruby/bsearch[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/json_pure[ruby_targets_ruby19] dev-ruby/memoize[ruby_targets_ruby19] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby19] dev-ruby/ruby-hmac[ruby_targets_ruby19] dev-ruby/typed-array[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 )
-SLOT=0
-SRC_URI=http://mikutter.hachune.net/bin/mikutter.0.2.2.1537.tar.gz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=d0c9ec91df1a7007446c2fc8e370645f
diff --git a/metadata/md5-cache/net-misc/mikutter-3.0.2 b/metadata/md5-cache/net-misc/mikutter-3.0.2
new file mode 100644
index 000000000000..18ddc6ef100e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mikutter-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] dev-ruby/bsearch[ruby_targets_ruby19] dev-ruby/delayer[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/memoize[ruby_targets_ruby19] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby19] dev-ruby/ruby-hmac[ruby_targets_ruby19] dev-ruby/typed-array[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DESCRIPTION=mikutter is simple, powerful and moeful twitter client
+EAPI=5
+HOMEPAGE=http://mikutter.hachune.net/
+IUSE=+libnotify sound test elibc_FreeBSD ruby_targets_ruby19
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby_targets_ruby19? ( dev-ruby/addressable[ruby_targets_ruby19] dev-ruby/bsearch[ruby_targets_ruby19] dev-ruby/delayer[ruby_targets_ruby19] dev-ruby/json[ruby_targets_ruby19] dev-ruby/memoize[ruby_targets_ruby19] >=dev-ruby/oauth-0.4.7[ruby_targets_ruby19] dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-gettext-3.0.1[ruby_targets_ruby19] >=dev-ruby/ruby-gtk2-2.2.0[ruby_targets_ruby19] dev-ruby/ruby-hmac[ruby_targets_ruby19] dev-ruby/typed-array[ruby_targets_ruby19] virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=http://mikutter.hachune.net/bin/mikutter.3.0.2.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=24ec2a7c98c3cac54b5fe487c4b81a2d
diff --git a/metadata/md5-cache/net-misc/mikutter-9999 b/metadata/md5-cache/net-misc/mikutter-9999
index 5dbcd9aecc53..72e4cbf8dfbc 100644
--- a/metadata/md5-cache/net-misc/mikutter-9999
+++ b/metadata/md5-cache/net-misc/mikutter-9999
@@ -9,4 +9,4 @@ RDEPEND=libnotify? ( x11-libs/libnotify ) sound? ( media-sound/alsa-utils ) ruby
 REQUIRED_USE=|| ( ruby_targets_ruby19 )
 SLOT=0
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	fac675dcccf94392371a6abee62d909f	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=7579d2d02a002440edf5a336cf978356
+_md5_=37bbf7c44d87e73e201c33b6f65ac3fa
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.4 b/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.4
deleted file mode 100644
index ccd596be5d93..000000000000
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=NetworkManager OpenConnect plugin
-EAPI=5
-HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
-IUSE=gtk
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.4.tar.xz
-_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=70054314a09fd285d4c1e2486c4d24ef
diff --git a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6 b/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
index 1cc6dee3cee8..4397692e53ee 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
+++ b/metadata/md5-cache/net-misc/networkmanager-openconnect-0.9.8.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=NetworkManager OpenConnect plugin
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 IUSE=gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
+RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 gnome-base/libgnome-keyring >=net-misc/openconnect-3.02:= gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.6.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	9637c29fc715b17a6328f24251129557	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=1a145d81cda3b437e92a2320b0ba2383
+_md5_=8b4a2bd105d12414c3e53a5e8b8282c6
diff --git a/metadata/md5-cache/net-misc/networkmanager-openswan-0.9.8.4 b/metadata/md5-cache/net-misc/networkmanager-openswan-0.9.8.4
index 13416cc8e8f2..1b5e1cccc86e 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openswan-0.9.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-openswan-0.9.8.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( >=x11-libs/gtk+-3.0.0:3 gnome-base/gnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( >=x11-libs/gtk+-3.0.0:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=NetworkManager Openswan plugin
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
 IUSE=gtk
 KEYWORDS=amd64 x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( >=x11-libs/gtk+-3.0.0:3 gnome-base/gnome-keyring )
+RDEPEND=>=net-misc/networkmanager-0.9.8:= >=dev-libs/dbus-glib-0.74 || ( net-misc/openswan net-misc/libreswan ) gtk? ( >=x11-libs/gtk+-3.0.0:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openswan/0.9/NetworkManager-openswan-0.9.8.4.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=6b349af32748066c18a667d84bd2af33
+_md5_=2a32ab6f5b28fa975b444deb23fbf458
diff --git a/metadata/md5-cache/net-misc/networkmanager-openvpn-0.9.8.4 b/metadata/md5-cache/net-misc/networkmanager-openvpn-0.9.8.4
index e9dba8ac360a..c5619d26aec9 100644
--- a/metadata/md5-cache/net-misc/networkmanager-openvpn-0.9.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-openvpn-0.9.8.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/dbus-glib-0.74 >=net-misc/networkmanager-0.9.8 >=net-misc/openvpn-2.1_rc9 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
+DEPEND=>=dev-libs/dbus-glib-0.74 >=net-misc/networkmanager-0.9.8 >=net-misc/openvpn-2.1_rc9 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) sys-devel/gettext >=dev-util/intltool-0.35 virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
 DESCRIPTION=NetworkManager OpenVPN plugin
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/dbus-glib-0.74 >=net-misc/networkmanager-0.9.8 >=net-misc/openvpn-2.1_rc9 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.74 >=net-misc/networkmanager-0.9.8 >=net-misc/openvpn-2.1_rc9 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-0.9.8.4.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=4c87a9a50d2727d048e48eca21e53b1d
+_md5_=e48a9816955abdf12dbacec01ee7253b
diff --git a/metadata/md5-cache/net-misc/networkmanager-pptp-0.9.8.4 b/metadata/md5-cache/net-misc/networkmanager-pptp-0.9.8.4
index 2034bfd99b8e..f4da3c79ead0 100644
--- a/metadata/md5-cache/net-misc/networkmanager-pptp-0.9.8.4
+++ b/metadata/md5-cache/net-misc/networkmanager-pptp-0.9.8.4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 net-dialup/ppp net-dialup/pptpclient gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
+DEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 net-dialup/ppp net-dialup/pptpclient gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
 DESCRIPTION=NetworkManager PPTP plugin
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
 IUSE=gtk
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 net-dialup/ppp net-dialup/pptpclient gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
+RDEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 net-dialup/ppp net-dialup/pptpclient gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-0.9.8.4.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3de0f3c94b4a34a843d1c8326de29f30
+_md5_=30ba89a370f492e89965987de987f587
diff --git a/metadata/md5-cache/net-misc/networkmanager-sstp-0.9.8 b/metadata/md5-cache/net-misc/networkmanager-sstp-0.9.8
index e0b9d19b1688..aab5c5cf43a1 100644
--- a/metadata/md5-cache/net-misc/networkmanager-sstp-0.9.8
+++ b/metadata/md5-cache/net-misc/networkmanager-sstp-0.9.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-0.9.8 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 gnome-base/gnome-keyring ) virtual/pkgconfig sys-devel/gettext dev-util/intltool
+DEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-0.9.8 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) virtual/pkgconfig sys-devel/gettext dev-util/intltool
 DESCRIPTION=Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/sstp-client/
 IUSE=gtk
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-0.9.8 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 gnome-base/gnome-keyring )
+RDEPEND=>=dev-libs/dbus-glib-0.74 net-misc/sstp-client >=net-misc/networkmanager-0.9.8 net-dialup/ppp:= gtk? ( x11-libs/gtk+:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/sstp-client/network-manager-sstp/0.9.8-1/NetworkManager-sstp-0.9.8.tar.bz2
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e1af025d6d7e01ff50a8add17d39312f
+_md5_=9c8d2c99abf9de362663a0cd9dfd905d
diff --git a/metadata/md5-cache/net-misc/networkmanager-vpnc-0.9.8.6 b/metadata/md5-cache/net-misc/networkmanager-vpnc-0.9.8.6
index 821cc03fb6c4..c6248e19d927 100644
--- a/metadata/md5-cache/net-misc/networkmanager-vpnc-0.9.8.6
+++ b/metadata/md5-cache/net-misc/networkmanager-vpnc-0.9.8.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 >=net-misc/vpnc-0.5 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
+DEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 >=net-misc/vpnc-0.5 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring ) sys-devel/gettext dev-util/intltool virtual/pkgconfig >=sys-apps/sed-4 app-arch/xz-utils
 DESCRIPTION=NetworkManager VPNC plugin
 EAPI=5
 HOMEPAGE=http://www.gnome.org/projects/NetworkManager/
 IUSE=gtk test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 >=net-misc/vpnc-0.5 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring )
+RDEPEND=>=net-misc/networkmanager-0.9.8 >=dev-libs/dbus-glib-0.74 >=net-misc/vpnc-0.5 gtk? ( >=x11-libs/gtk+-2.91.4:3 gnome-base/gnome-keyring gnome-base/libgnome-keyring )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-0.9.8.6.tar.xz
 _eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=9b0ebac4b73e7bcea1dadcb6888f2208
+_md5_=e9072150a603ddcafadf7fb768916ba6
diff --git a/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1 b/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1
deleted file mode 100644
index ac8b916faeec..000000000000
--- a/metadata/md5-cache/net-misc/proxychains-3.1_p20110225-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
-EAPI=4
-HOMEPAGE=http://proxychains.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=net-dns/bind-tools
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/proxychains-3.1_p20110225.tar.xz
-_eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	autotools-utils	fb74970befc9b65ceec689d2ccff3022	eutils	025442f2eecab39ad0b4e541b6e142af	libtool	2964b38e7ad7f6998406386ad1c6dbcf	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=b228c83a2f68f040c19bd15f640b00b9
diff --git a/metadata/md5-cache/net-misc/proxychains-4.7 b/metadata/md5-cache/net-misc/proxychains-4.7
new file mode 100644
index 000000000000..2e3ff7e0b04b
--- /dev/null
+++ b/metadata/md5-cache/net-misc/proxychains-4.7
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=force any tcp connections to flow through a proxy (or proxy chain)
+EAPI=5
+HOMEPAGE=https://github.com/rofl0r/proxychains-ng/
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/rofl0r/proxychains-ng/archive/v4.7.tar.gz -> proxychains-ng-4.7.tar.gz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ab78000b77498fc447ffc267945d421a
diff --git a/metadata/md5-cache/net-misc/wicd-1.7.2.4-r3 b/metadata/md5-cache/net-misc/wicd-1.7.2.4-r3
index 3da9f6706b29..3d2414c1eeb4 100644
--- a/metadata/md5-cache/net-misc/wicd-1.7.2.4-r3
+++ b/metadata/md5-cache/net-misc/wicd-1.7.2.4-r3
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight wired and wireless network manager for Linux
 EAPI=5
 HOMEPAGE=https://launchpad.net/wicd
 IUSE=doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~mips ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] X? ( gtk? ( dev-python/pygtk ) || ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu ) ) || ( net-misc/dhcpcd net-misc/dhcp net-misc/pump ) net-wireless/wireless-tools net-wireless/wpa_supplicant || ( sys-apps/net-tools sys-apps/ethtool ) !gtk? ( dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl ) libnotify? ( dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ncurses? ( dev-python/urwid dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pm-utils? ( sys-power/pm-utils ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses?,xml] ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://launchpad.net/wicd/1.7/1.7.2.4/+download/wicd-1.7.2.4.tar.gz mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz ) ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )
 _eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=162c66d88f9827526f0ee21d635f30a3
+_md5_=69abe1577bda6a7b60b0a68de8b082cd
diff --git a/metadata/md5-cache/net-misc/yandex-disk-0.1.4.504_p1 b/metadata/md5-cache/net-misc/yandex-disk-0.1.4.504_p1
new file mode 100644
index 000000000000..3e234d190124
--- /dev/null
+++ b/metadata/md5-cache/net-misc/yandex-disk-0.1.4.504_p1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=CLI to access Yandex Disk file storage service
+EAPI=5
+HOMEPAGE=https://disk.yandex.ru
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=YDSLA
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/yandex-disk-0.1.4.504-1.fedora.x86_64.rpm ) x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/yandex-disk-0.1.4.504-1.fedora.i386.rpm )
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=e959feb3b31b8c31f88a886263e1d40f
diff --git a/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.141-r2 b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.141-r2
new file mode 100644
index 000000000000..8afa8f7c098b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.141-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DESCRIPTION=Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver
+EAPI=5
+HOMEPAGE=http://www.broadcom.com/support/802.11/linux_sta.php
+IUSE=kernel_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Broadcom
+RDEPEND=kernel_linux? ( virtual/modutils )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=x86? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz ) amd64? ( http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz )
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=51c78b973f0a8b87220c60fdcdea9553
diff --git a/metadata/md5-cache/sys-apps/dbus-1.8.4 b/metadata/md5-cache/sys-apps/dbus-1.8.4
index edb2f8e311da..15a5cbf89337 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.8.4
+++ b/metadata/md5-cache/sys-apps/dbus-1.8.4
@@ -4,10 +4,10 @@ DESCRIPTION=A message bus system, a simple way for applications to talk to each
 EAPI=5
 HOMEPAGE=http://dbus.freedesktop.org/
 IUSE=debug doc selinux static-libs systemd test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.8.4.tar.gz
 _eclasses_=autotools	5256b4f4c1798109f39f308f9f7eaf5f	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	libtool	2964b38e7ad7f6998406386ad1c6dbcf	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	6164ef644981c5dffdf4cf891caed613	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=1b2f6196bca8382b42ce3b3971972991
+_md5_=bab5c4fab8253ffdcde7c08d9aae00ea
diff --git a/metadata/md5-cache/sys-cluster/swift-1.13.0 b/metadata/md5-cache/sys-cluster/swift-1.13.0-r1
similarity index 98%
rename from metadata/md5-cache/sys-cluster/swift-1.13.0
rename to metadata/md5-cache/sys-cluster/swift-1.13.0-r1
index 6d2bde46e59e..fb6c675dd4f9 100644
--- a/metadata/md5-cache/sys-cluster/swift-1.13.0
+++ b/metadata/md5-cache/sys-cluster/swift-1.13.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/swift/icehouse/1.13.0/+download/swift-1.13.0.tar.gz
 _eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=3ae4dc495b518a0a2ab19e2fb3b3329a
+_md5_=ab4e6706e8c5ee8131cd5d1b83184086
diff --git a/metadata/md5-cache/sys-cluster/swift-1.13.1 b/metadata/md5-cache/sys-cluster/swift-1.13.1-r1
similarity index 98%
rename from metadata/md5-cache/sys-cluster/swift-1.13.1
rename to metadata/md5-cache/sys-cluster/swift-1.13.1-r1
index eacacbf315ee..c31bc20c066a 100644
--- a/metadata/md5-cache/sys-cluster/swift-1.13.1
+++ b/metadata/md5-cache/sys-cluster/swift-1.13.1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( proxy account container object ) || ( python_targets_python2_7
 SLOT=0
 SRC_URI=http://launchpad.net/swift/icehouse/1.13.1/+download/swift-1.13.1.tar.gz
 _eclasses_=distutils-r1	051beafa534d831ab1129e71788b681a	eutils	025442f2eecab39ad0b4e541b6e142af	linux-info	90944ede7e9761bd7ef07602acdef9e3	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=b2a11856255e8e26f241c7b7cfd00a1d
+_md5_=d2bacdbda01876680a37ba89bfb5fd14
diff --git a/metadata/md5-cache/sys-devel/clang-3.4.2-r100 b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
new file mode 100644
index 000000000000..82209efbcae9
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst postrm
+DESCRIPTION=C language family frontend for LLVM (meta-ebuild)
+EAPI=5
+HOMEPAGE=http://clang.llvm.org/
+IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-3.4.2[clang(-),debug=,multitarget?,python?,static-analyzer,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?]
+SLOT=0/3.4
+_eclasses_=multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=ebd5f5d00393391b15746e3705430577
diff --git a/metadata/md5-cache/sys-devel/llvm-3.4.2 b/metadata/md5-cache/sys-devel/llvm-3.4.2
new file mode 100644
index 000000000000..f1778eb2cee3
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-3.4.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libffi? ( virtual/libffi:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ncurses? ( sys-libs/ncurses:5=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ocaml? ( dev-lang/ocaml:0= ) udis86? ( dev-libs/udis86:0=[pic(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) dev-lang/perl >=sys-devel/make-3.81 >=sys-devel/flex-2.5.4 >=sys-devel/bison-1.875d || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx ) ) || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) clang? ( xml? ( virtual/pkgconfig ) ) doc? ( dev-python/sphinx ) libffi? ( virtual/pkgconfig ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] cmake? ( sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=5
+HOMEPAGE=http://llvm.org/
+IUSE=clang debug doc gold +libffi multitarget ncurses ocaml python +static-analyzer test udis86 xml video_cards_radeon kernel_Darwin kernel_FreeBSD cmake abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 python_targets_python2_7 python_targets_pypy
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=UoI-NCSA
+PDEPEND=clang? ( =sys-devel/clang-3.4.2-r100 )
+RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libffi? ( virtual/libffi:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ncurses? ( sys-libs/ncurses:5=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) ocaml? ( dev-lang/ocaml:0= ) udis86? ( dev-libs/udis86:0=[pic(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) clang? ( !<=sys-devel/clang-3.4-r99 !>=sys-devel/clang-9999 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
+SLOT=0/3.4
+SRC_URI=http://llvm.org/releases/3.4.2/llvm-3.4.2.src.tar.gz clang? ( http://llvm.org/releases/3.4.2/compiler-rt-3.4.src.tar.gz http://llvm.org/releases/3.4.2/cfe-3.4.2.src.tar.gz http://llvm.org/releases/3.4.2/clang-tools-extra-3.4.src.tar.gz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/llvm-3.4-manpages.tar.bz2 )
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	412d9e2d2c6f85f46dad595e68570d21	eutils	025442f2eecab39ad0b4e541b6e142af	flag-o-matic	32bd61b45c2f57e468b4ee7311fec8f5	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	fac675dcccf94392371a6abee62d909f	multilib-build	02e68fc95064bb486c12ad2de16b8c82	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	c2d96fb38f2596209e98fceda58ba1ed	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	36d89a1c51cb1e624d5cdbea26adb9ad	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=f1386442a0bd0a7a41cbb891c64f47d9
diff --git a/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.28 b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.28
new file mode 100644
index 000000000000..5504fdea1b62
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/alsa-firmware-1.0.28
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Advanced Linux Sound Architecture firmware
+EAPI=5
+HOMEPAGE=http://www.alsa-project.org/
+IUSE=alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16 alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20 alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820 alsa_cards_emu10k1
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=alsa_cards_usb-usx2y? ( sys-apps/fxload ) alsa_cards_hdsp? ( media-sound/alsa-tools ) alsa_cards_hdspm? ( media-sound/alsa-tools )
+SLOT=0
+SRC_URI=mirror://alsaproject/firmware/alsa-firmware-1.0.28.tar.bz2
+_eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	udev	a9a8d051efb42bfe884c1db82ce161de
+_md5_=5ad8501cfc19d2b7474d00c9febc02bb
diff --git a/metadata/md5-cache/sys-kernel/genkernel-3.4.50 b/metadata/md5-cache/sys-kernel/genkernel-3.4.50
new file mode 100644
index 000000000000..8fc15021d86a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-3.4.50
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=3
+HOMEPAGE=http://www.gentoo.org
+IUSE=crypt cryptsetup ibm selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-3.4.50.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=d3c62aa33dce7876db21e2829ba69a54
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index 2b7840e07412..e47d776151b1 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -9,4 +9,4 @@ RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/c
 SLOT=0
 SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
 _eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=e4cfce4b462c43d835e604369f82ac35
+_md5_=5f449e9918972100fbeb69c5dcbcc43f
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999-r1 b/metadata/md5-cache/sys-kernel/genkernel-9999-r1
new file mode 100644
index 000000000000..167c532bc393
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare pretend unpack
+DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) app-text/asciidoc dev-vcs/git
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=4
+HOMEPAGE=http://www.gentoo.org
+IUSE=cryptsetup ibm selinux
+LICENSE=GPL-2
+RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-0.2.1 !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.20.2.tar.bz2 http://www.open-iscsi.org/bits/open-iscsi-2.0-872.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
+_eclasses_=bash-completion-r1	db412e427e3317ffd3e15f17df269c5e	eutils	025442f2eecab39ad0b4e541b6e142af	git-2	2027b81a576527fa16bece425941e094	git-r3	da25af7340478afdca16e1e4568b014a	multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=38aefb6b153279f04ea07c3192691800
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.8-r2 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.8-r2
new file mode 100644
index 000000000000..ec681b4345c5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.8-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.14)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.8-r2
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-3.14 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.14.N/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.8-3.extras.tar.bz2 mirror://gentoo/genpatches-3.14-12.base.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=4497133551e0294b444e20df2e37f91e
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.15.1 b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.1
new file mode 100644
index 000000000000..31cb1cb74970
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.15.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.15)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.15.1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-3.15 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.15.N/deblob-check -> deblob-check-3.15 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.15.1-1.extras.tar.bz2 mirror://gentoo/genpatches-3.15-3.base.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=7716fb607b8a5b1f1eb4ca690fdac530
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.60-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.60-r3
new file mode 100644
index 000000000000..fc6819200c09
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.60-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Hardened kernel sources (kernel series 3.2)
+EAPI=5
+HOMEPAGE=http://www.gentoo.org/proj/en/hardened/
+IUSE=deblob symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.2.60-r3
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-3.2 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.2.N/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.60-4.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+_eclasses_=eutils	025442f2eecab39ad0b4e541b6e142af	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	fac675dcccf94392371a6abee62d909f	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	6164ef644981c5dffdf4cf891caed613	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	versionator	a8a3963967d6140be9a14b08bb8f047f
+_md5_=156fab8cebecd229615550e48da69517
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2054.3_p1 b/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.0_p1
similarity index 92%
rename from metadata/md5-cache/www-client/google-chrome-unstable-37.0.2054.3_p1
rename to metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.0_p1
index e96903b7c3b7..24cc6a2001b8 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2054.3_p1
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-37.0.2062.0_p1
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 || ( dev-libs/libgcrypt:11 dev-libs/libgcrypt:0/11 ) dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-print/cups sys-apps/dbus >=sys-devel/gcc-4.4.0[cxx] sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite 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? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2054.3-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2054.3-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.0-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.0-1_i386.deb )
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	025442f2eecab39ad0b4e541b6e142af	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	90944ede7e9761bd7ef07602acdef9e3	multilib	fac675dcccf94392371a6abee62d909f	pax-utils	2424f959506320f5196de8f79fa05297	readme.gentoo	be2652cdd5c20f4689ccb4769072ea99	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641	versionator	a8a3963967d6140be9a14b08bb8f047f
-_md5_=a85608af012e0b0b9184393eb5fbc6f7
+_md5_=7f1a2154682318b04346dd681ede4aa4
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2054.3_alpha1 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.0_alpha1
similarity index 81%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2054.3_alpha1
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.0_alpha1
index 85749f3529d4..9c98b3fa3fa0 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2054.3_alpha1
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-37.0.2062.0_alpha1
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND==www-client/chromium-37* !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? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2054.3-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2054.3-1_i386.deb )
+SRC_URI=amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.0-1_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_37.0.2062.0-1_i386.deb )
 _eclasses_=multilib	fac675dcccf94392371a6abee62d909f	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	unpacker	4495f6885ab72b2cc94467e9a89fa641
-_md5_=736801aeadf53582bb5320318421503a
+_md5_=d96663b523d8079ef8b46368242701d9
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 86b3e38ee89f..51e7eb0e651f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 23 Jun 2014 15:37:07 +0000
+Tue, 24 Jun 2014 11:07:04 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 891728ef1308..d2452c3b262f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jun 23 15:37:04 UTC 2014
+Tue Jun 24 11:07:01 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 4ff133282810..53284c75bc5f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 23 Jun 2014 16:00:01 +0000
+Tue, 24 Jun 2014 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index cd74494a71eb..d6092e24e979 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1403537701 Mon 23 Jun 2014 03:35:01 PM UTC UTC
+1403607901 Tue 24 Jun 2014 11:05:01 AM UTC UTC
diff --git a/net-analyzer/alive/alive-2.0.2.ebuild b/net-analyzer/alive/alive-2.0.2.ebuild
index 03b5f6cf79fd..c1ced2d5560f 100644
--- a/net-analyzer/alive/alive-2.0.2.ebuild
+++ b/net-analyzer/alive/alive-2.0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/alive/alive-2.0.2.ebuild,v 1.1 2013/10/05 16:29:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/alive/alive-2.0.2.ebuild,v 1.2 2014/06/24 02:30:03 jer Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="a periodic ping program"
 HOMEPAGE="http://www.gnu.org/software/alive/"
@@ -13,8 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
-DEPEND="app-arch/xz-utils"
+COMMON_DEPEND="net-misc/iputils"
+DEPEND="
+	app-arch/xz-utils
+	${COMMON_DEPEND}
+"
 RDEPEND="
 	dev-scheme/guile
-	net-misc/iputils
+	${COMMON_DEPEND}
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ping-test.patch
+	eautoreconf
+}
diff --git a/net-analyzer/alive/files/alive-2.0.2-ping-test.patch b/net-analyzer/alive/files/alive-2.0.2-ping-test.patch
new file mode 100644
index 000000000000..3b1b1257c9b3
--- /dev/null
+++ b/net-analyzer/alive/files/alive-2.0.2-ping-test.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,11 +35,6 @@
+  [alive_cv_nice_ping=yes],
+  [alive_cv_nice_ping=no])])
+ 
+-dnl Luckily both inetutils-ping and iputils-ping are nice.
+-AS_IF([test xno = x$alive_cv_nice_ping],
+-[AC_MSG_ERROR([$PING does not support ‘-n -c 1’.
+-Please install a ping program that does, and retry.])])
+-
+ AC_CONFIG_FILES([
+   Makefile
+   src/Makefile
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
index 3c30c6197ca8..9a58c6369929 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch
@@ -1,5 +1,5 @@
---- base/pcap-snoop.c	2007-11-06 14:22:53.000000000 +0100
-+++ base/pcap-snoop_new.c	2007-11-06 14:24:05.000000000 +0100
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
 @@ -157,6 +157,10 @@
            return;
          
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
index 13128551dfe9..0c5e2eec4a01 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch
@@ -1,5 +1,5 @@
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -1103,7 +1103,7 @@
  echo "configure:1104: checking for PCAP library" >&5
  ac_found_pcap_lib_dir="no"
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
index 95f9fda31dc0..a9a724658ccf 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch
@@ -1,5 +1,5 @@
---- base/pcap-snoop.c	2002-09-09 21:02:58.000000000 +0000
-+++ base/pcap-snoop.c	2004-02-06 14:59:37.278455352 +0000
+--- a/base/pcap-snoop.c
++++ b/base/pcap-snoop.c
 @@ -49,7 +49,6 @@
  
  #include <pcap.h>
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
index 56b118746d5a..2ce16d54f168 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch
@@ -1,6 +1,5 @@
-diff -Naur ssldump-0.9b3.orig/ssl/ssldecode.c ssldump-0.9b3/ssl/ssldecode.c
---- ssldump-0.9b3.orig/ssl/ssldecode.c	2002-08-17 05:33:17.000000000 +0400
-+++ ssldump-0.9b3/ssl/ssldecode.c	2006-09-24 11:30:58.000000000 +0400
+--- a/ssl/ssldecode.c
++++ b/ssl/ssldecode.c
 @@ -51,6 +51,7 @@
  #include <openssl/ssl.h>
  #include <openssl/hmac.h>
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
index 4d665da7e045..74d7ddcd6f68 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch
@@ -1,6 +1,7 @@
 eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335
---- Makefile.in	2001-11-27 07:38:13.000000000 +0900
-+++ Makefile.in.new	2012-05-02 16:13:10.000000000 +0900
+
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -46,13 +46,12 @@ BINDIR=@sbindir@
  MANDIR=@mandir@
  RM=rm -f
diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest
index 1e9c83160789..8f93f3194d53 100644
--- a/net-analyzer/symon/Manifest
+++ b/net-analyzer/symon/Manifest
@@ -1,2 +1 @@
-DIST symon-2.85.tar.gz 106011 SHA256 547329a1efbc2408298256d31a005db23869117ccf6249c052ef662b3ee12d35 SHA512 e018950834620a581a9208727b3a8b70f714a4e8f8108ef261f8063e37b4491b0c9b1c174bedfd7402a9751c911275cca0d31e8773ededb0af90185e019d6db4 WHIRLPOOL 2516fc5160675aba707680b76f9a253d251b0501d89fe7b7ae5cd039762ed5a8f9c73be1e8c4909fa0232e66af78c129a339ee4d8a75d9bb86bccd0128665b75
 DIST symon-2.86.tar.gz 106791 SHA256 c36457e53e91cbb478cb57d96bf40c718a8582e0b19bd4cba247002b7a6068b3 SHA512 13f96654ee4569ac0a92fd601962d2610e83d03a59b0772c385788586ee7bcc2639012388b8c123dd6f12368e21e834c5a12c32152fc73e9e87553889962ee46 WHIRLPOOL bc94567f1c7ca36d30afd74f2747cbb239e86b8b7255541ff5ca4e2adafaed794249f455339a04c8291260430279840395e02e3733619f0e3595da2fdbfd7d21
diff --git a/net-analyzer/symon/files/symon-init.d b/net-analyzer/symon/files/symon-init.d
index 6b6ac1384567..5120c6a33c23 100644
--- a/net-analyzer/symon/files/symon-init.d
+++ b/net-analyzer/symon/files/symon-init.d
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the 2-clause BSD license
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symon-init.d,v 1.3 2012/09/13 07:07:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symon-init.d,v 1.4 2014/06/24 01:31:06 jer Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	after bootmisc
@@ -13,8 +13,10 @@ depend() {
 
 reload() {
 	ebegin "Reloading symon"
-	start-stop-daemon --stop --pidfile /var/run/symon.pid \
-		--exec /usr/sbin/symon --oknodo --signal HUP
+	start-stop-daemon \
+		--pidfile /run/symon.pid \
+		--exec /usr/sbin/symon \
+		--signal HUP
 	eend $?
 }
 
@@ -26,6 +28,6 @@ start() {
 
 stop() {
 	ebegin "Stopping symon"
-	start-stop-daemon --stop --pidfile /var/run/symon.pid
+	start-stop-daemon --stop --pidfile /run/symon.pid
 	eend $?
 }
diff --git a/net-analyzer/symon/files/symux-init.d b/net-analyzer/symon/files/symux-init.d
index b96e2ff5345c..14b8f4ce4124 100644
--- a/net-analyzer/symon/files/symux-init.d
+++ b/net-analyzer/symon/files/symux-init.d
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the 2-clause BSD license
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symux-init.d,v 1.3 2012/09/13 07:07:53 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/files/symux-init.d,v 1.4 2014/06/24 01:31:06 jer Exp $
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 depend() {
 	after bootmisc
@@ -13,8 +13,10 @@ depend() {
 
 reload() {
 	ebegin "Reloading symux"
-	start-stop-daemon --stop --pidfile /var/run/symux.pid \
-		--exec /usr/sbin/symux --oknodo --signal HUP
+	start-stop-daemon \
+		--pidfile /run/symux.pid \
+		--exec /usr/sbin/symux \
+		--signal HUP
 	eend $?
 }
 
@@ -26,6 +28,6 @@ start() {
 
 stop() {
 	ebegin "Stopping symux"
-	start-stop-daemon --stop --pidfile /var/run/symux.pid
+	start-stop-daemon --stop --pidfile /run/symux.pid
 	eend $?
 }
diff --git a/net-analyzer/symon/symon-2.85.ebuild b/net-analyzer/symon/symon-2.85.ebuild
deleted file mode 100644
index 5e0e41de6f59..000000000000
--- a/net-analyzer/symon/symon-2.85.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.85.ebuild,v 1.1 2012/04/17 16:39:50 jer Exp $
-
-EAPI=4
-
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="Performance and information monitoring tool"
-HOMEPAGE="http://www.xs4all.nl/~wpd/symon/"
-SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="perl +symon symux"
-
-RDEPEND="perl? ( dev-lang/perl )
-	symux? ( net-analyzer/rrdtool )"
-DEPEND="${RDEPEND}
-	virtual/pmake"
-
-S=${WORKDIR}/${PN}
-
-# Deletes the directory passed as an argument from the internal pmake
-# variable SUBDIR.
-zap_subdir() {
-	sed -i "/^SUBDIR/s/$1//" Makefile || die
-}
-
-pkg_setup() {
-	use symon && USE_SYMON=1 && return
-
-	if ! use perl && ! use symon && ! use symux; then
-		ewarn "You have all available USE flags disabled. Therefore, only the"
-		ewarn "system monitor will be emerged. Please, enable at least one USE"
-		ewarn "flag to avoid this message."
-		USE_SYMON=1
-	fi
-}
-
-src_prepare() {
-	# Respect LDFLAGS.
-	sed -i "/^[ \t]*\${CC}.*\${LIBS}/s/\${CC}/& \${LDFLAGS}/" sym*/Makefile \
-		|| die "sed ldflags failed"
-
-	# Do some sed magic in accordance with the USE flags.
-	use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib
-	! use perl && zap_subdir client
-	! use symux && zap_subdir symux
-	[[ -z ${USE_SYMON} ]] && zap_subdir symon
-}
-
-src_compile() {
-	pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed"
-}
-
-src_install() {
-	if [[ -n ${USE_SYMON} ]]; then
-		insinto /etc
-		doins "${FILESDIR}"/symon.conf
-
-		newinitd "${FILESDIR}"/symon-init.d symon
-
-		dodoc CHANGELOG HACKERS TODO
-
-		doman symon/symon.8
-		dosbin symon/symon
-	fi
-
-	if use perl; then
-		dobin client/getsymonitem.pl
-
-		perlinfo
-		insinto ${VENDOR_LIB}
-		doins client/SymuxClient.pm
-	fi
-
-	if use symux; then
-		insinto /etc
-		doins "${FILESDIR}"/symux.conf
-
-		newinitd "${FILESDIR}"/symux-init.d symux
-
-		doman symux/symux.8
-		dosbin symux/symux
-
-		dodir /usr/share/symon
-		insinto /usr/share/symon
-		doins symux/c_smrrds.sh
-		fperms a+x /usr/share/symon/c_smrrds.sh
-
-		dodir /var/lib/symon/rrds/localhost
-	fi
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-
-	if use symux; then
-		elog "The RRDs files can be obtained by running"
-		elog "/usr/share/symon/c_smrrds.sh all."
-		elog "For information about migrating RRDs from a previous"
-		elog "symux version read the LEGACY FORMATS section of symux(8)."
-		elog "To view the rrdtool pictures of the stored data, emerge"
-		elog "net-analyzer/syweb."
-	fi
-}
diff --git a/net-analyzer/symon/symon-2.86.ebuild b/net-analyzer/symon/symon-2.86-r1.ebuild
similarity index 96%
rename from net-analyzer/symon/symon-2.86.ebuild
rename to net-analyzer/symon/symon-2.86-r1.ebuild
index 405da6242e23..b4c824856c86 100644
--- a/net-analyzer/symon/symon-2.86.ebuild
+++ b/net-analyzer/symon/symon-2.86-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86.ebuild,v 1.1 2013/02/20 13:38:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/symon/symon-2.86-r1.ebuild,v 1.1 2014/06/24 01:31:06 jer Exp $
 
 EAPI=5
 
diff --git a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
index 493f26ac957a..3a52518180b5 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.12 2012/05/13 11:15:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-0.49-r1.ebuild,v 1.13 2014/06/24 02:26:26 vapier Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 
-LICENSE="BSD"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
index 9f155b08cbe6..74c70bd4b9f2 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.6 2012/05/13 11:15:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.0.ebuild,v 1.7 2014/06/24 02:26:26 vapier Exp $
 
 DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="mirror://kernel/software/network/tftp/${P}.tar.bz2"
 
-LICENSE="BSD"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
index 4980554954de..93ca05940dd0 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild,v 1.10 2012/05/13 11:15:32 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.1.ebuild,v 1.11 2014/06/24 02:26:26 vapier Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
 
-LICENSE="BSD"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="ipv6 readline selinux tcpd"
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
index 76a8cb2fc050..72f2dbfd12c1 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild,v 1.9 2014/03/09 20:18:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2-r1.ebuild,v 1.10 2014/06/24 02:26:26 vapier Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
 
-LICENSE="BSD"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd"
diff --git a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild b/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
index 7b1f61c5a711..4c96913159b7 100644
--- a/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
+++ b/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild,v 1.9 2012/09/15 18:50:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/tftp-hpa-5.2.ebuild,v 1.10 2014/06/24 02:26:26 vapier Exp $
 
 EAPI="4"
 
@@ -10,7 +10,7 @@ DESCRIPTION="port of the OpenBSD TFTP server"
 HOMEPAGE="http://www.kernel.org/pub/software/network/tftp/"
 SRC_URI="mirror://kernel/software/network/tftp/${PN}/${P}.tar.xz"
 
-LICENSE="BSD"
+LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-macos"
 IUSE="ipv6 readline selinux tcpd"
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 1cf6a5f9a0c5..12d864708a34 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,5 +1,3 @@
 DIST imapsync-1.567.tgz 848206 SHA256 ea266023adc1c1ee0dab2605865c17ca78353504869415924fc6c20fea798c88 SHA512 a0107c0ae9fa05d02d0cff9088abcd9b21fad71cfe6a9f4ce1d828910f0723018a40888538212fd3350baadf0cd9d75b78eedcd8a562dff611fe0956008019bd WHIRLPOOL 4b4052dc724ca4a51b0876c6347201417e63acf2fde053ba0557bcb1cc661b1e4ecb4db6d5865d09467223e8a412b78eb16f8d107b1bd94548d0836601f9cf2a
-DIST imapsync-1.569.tgz 955754 SHA256 7799b5d3787021d14c10cda08b36c54a285373c729b256235421da21f1f47a1e SHA512 4c35187a8591a9545347fa009004489d8a5d646c028e5344813a4c434c2170fded96cd521c14dfc3a522d0f01e863e413d01660e4cb542b8ef5a0e2f1e1f73d4 WHIRLPOOL 14cdb25a1ff6e1427e2fe2fbf6ad69c29286ef8f06d0a50212386faab96a2abc866b4cfa9a14402314a4abb9d123af4c4f397432fc507e74e50c1a5b2c75781f
-DIST imapsync-1.580.tgz 1029856 SHA256 053992837b652406d646eb3d83f1128799ea17116df544cd4f9364f3762b0bec SHA512 13065b0854723338a6a2a6d8a4f229e8f5418e03d9c3ffd73d92275846bf947f39af9fda26011e2b38b3466c16bc5cf1aaae87acb778e66abfbe129dba3d683d WHIRLPOOL 24ef36a5bf48e653642db6a19d0846e970257beac7537cb9452497b98a33d78d35dea29ebd67f45d93a46d269dc9a840ce30cf41b67a335d3ca6b02076a9b49f
 DIST imapsync-1.584.tgz 844115 SHA256 6f5eefe7646b9d2c41f94d100ee60d390a090c45e41c244de45ac7c31efc25ae SHA512 8978cc999b9af38b8d135a226456f858e265e21b138990b926d8b569088ccafc035dba9426f1a7f0d1027ef5e4432eec9ad113d8eb18c00c199afa3fb803eebe WHIRLPOOL 8f70ebbd4a42d2e7d0e1798e8c245ae7de41e2304d6f0ed873028a28dfe07e07af984b010d0aa68a028ce2d207144186a88e182dc3dbf730b9ac9e8c984469fc
 DIST imapsync-1.592.tgz 906578 SHA256 dd359a5b871dd278fbb39ba0c087576e97af1d746c49a104bc00a533b463ab64 SHA512 3d41b28396d9b8bf83200b324b2e312c76ef88e42f4ff8993c8d697b18f321400d7a157b1fee2d3ad4eae11400dc2186a18528bde50e370d856eac1b09c28f68 WHIRLPOOL ab0783acc911dacf394e19c4b3bbcd0bcc6de55088e11846271a590ffd4d79935d2bcffbe601bd1e599dffd1df5d9ade0fc6578b9252d3363f81f3982e96ff34
diff --git a/net-mail/imapsync/imapsync-1.569.ebuild b/net-mail/imapsync/imapsync-1.569.ebuild
deleted file mode 100644
index e73bf8eb5994..000000000000
--- a/net-mail/imapsync/imapsync-1.569.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.569.ebuild,v 1.1 2013/12/25 11:21:36 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/IO-Socket-SSL
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.580.ebuild b/net-mail/imapsync/imapsync-1.580.ebuild
deleted file mode 100644
index fcac7350974c..000000000000
--- a/net-mail/imapsync/imapsync-1.580.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.580.ebuild,v 1.1 2014/01/23 02:56:51 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/IO-Socket-SSL
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.584.ebuild b/net-mail/imapsync/imapsync-1.584.ebuild
deleted file mode 100644
index 36b870a84811..000000000000
--- a/net-mail/imapsync/imapsync-1.584.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.584.ebuild,v 1.1 2014/02/14 07:35:13 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/IO-Socket-SSL
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-mail/imapsync/imapsync-1.592.ebuild b/net-mail/imapsync/imapsync-1.592.ebuild
deleted file mode 100644
index ee7fb6a966da..000000000000
--- a/net-mail/imapsync/imapsync-1.592.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/imapsync/imapsync-1.592.ebuild,v 1.1 2014/06/15 07:48:12 radhermit Exp $
-
-EAPI=5
-
-DESCRIPTION="A tool allowing incremental and recursive imap transfer from one mailbox to another"
-HOMEPAGE="http://ks.lamiral.info/imapsync/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tgz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Digest-HMAC
-	dev-perl/File-Copy-Recursive
-	dev-perl/IO-Socket-SSL
-	dev-perl/Mail-IMAPClient
-	dev-perl/TermReadKey
-	virtual/perl-Digest-MD5
-	virtual/perl-MIME-Base64"
-
-RESTRICT="test"
-
-src_prepare() {
-	sed -e "s/^install: testp/install:/" \
-		-e "/^DO_IT/,/^$/d" \
-		-i "${S}"/Makefile || die
-}
-
-src_compile() { :; }
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index ad991f10cea7..9f064101a90e 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,2 +1,2 @@
-DIST mikutter.0.2.2.1537.tar.gz 2334837 SHA256 6d4762e3da22a76236e9cd045f6d06b207b8f3a6969d98f13c3ca22f7e762ed2 SHA512 773a4874339e1f461ae0bcdf7e3e7a337aa00e121dfd8c39e8b495d0a27efc783c43505c1232cbbce517959d14009dec87b75358cd62358a26dcb2f171c6a42f WHIRLPOOL 703772734f0109458c0fbd1dccbeab42f968974a5c11d38ea21e7aba34c69afb962313dbf0de42f43f25ad109c54ad6c2695953c704c996fc0c116cb988e7fc7
 DIST mikutter.3.0.0.tar.gz 2540909 SHA256 37fa3df3257d0af015fad81cba77f50ef169ccace0ea2e4ed715ddc1464e1c57 SHA512 87a34c552ec29cd0dc8430a8d2624e393dbbee256927436c38a260d7b0b1369160c1a381727b972ee4ce46a3f605dada4f92d270b967956284630378f330545e WHIRLPOOL 4d858102993e92aea7a2d3bd21836450cabefa45df7cc37386fb01faf6abe7c162788be5e3a527200764cca848a9e999a83d427d552347cc107dc4a3361d26f9
+DIST mikutter.3.0.2.tar.gz 2541078 SHA256 b0b41513d55eff90e2eba59accea02ff2c7e9984d4aba03b3c5a2922aed62bcb SHA512 800fc158d9227f3f6dd3dc63bd96dc4645fe2c9f63ae815a7a6ef1e1bfc5d763e6963c57e281028e88dca65c946152012f2f99d1e2d5ade16f02d07d757025cd WHIRLPOOL 7bc1053901cd4be22c1ca2b65ffc0581b6419cf0d982e467e73a9f4931b456f71adf78bf6431fd89289894047647f80fe4905cda41ebdae8964e9f3fe29e3b71
diff --git a/net-misc/mikutter/mikutter-0.2.2.1537.ebuild b/net-misc/mikutter/mikutter-3.0.2.ebuild
similarity index 85%
rename from net-misc/mikutter/mikutter-0.2.2.1537.ebuild
rename to net-misc/mikutter/mikutter-3.0.2.ebuild
index a69fdde70dff..75d18cf09890 100644
--- a/net-misc/mikutter/mikutter-0.2.2.1537.ebuild
+++ b/net-misc/mikutter/mikutter-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-0.2.2.1537.ebuild,v 1.2 2014/06/11 07:57:38 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-3.0.2.ebuild,v 1.1 2014/06/24 07:54:38 naota Exp $
 
 EAPI=5
 
@@ -33,20 +33,17 @@ RDEPEND="libnotify? ( x11-libs/libnotify )
 
 ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/bsearch
+	dev-ruby/delayer
 	dev-ruby/json
-	dev-ruby/json_pure
 	dev-ruby/memoize
 	>=dev-ruby/oauth-0.4.7
 	dev-ruby/rcairo
+	>=dev-ruby/ruby-gettext-3.0.1
 	>=dev-ruby/ruby-gtk2-2.2.0
 	dev-ruby/ruby-hmac
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
-RUBY_PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.2.1537-disable-bundler.patch
-)
-
 all_ruby_unpack() {
 	if [ "${PV}" = "9999" ];then
 		git-2_src_unpack
diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild
index d4370c761955..37dda39cb246 100644
--- a/net-misc/mikutter/mikutter-9999.ebuild
+++ b/net-misc/mikutter/mikutter-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.5 2014/06/11 07:57:38 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mikutter/mikutter-9999.ebuild,v 1.6 2014/06/24 07:54:38 naota Exp $
 
 EAPI=5
 
@@ -44,10 +44,6 @@ ruby_add_rdepend "dev-ruby/addressable
 	dev-ruby/typed-array
 	virtual/ruby-ssl"
 
-RUBY_PATCHES=(
-	"${FILESDIR}"/${PN}-0.2.2.1537-disable-bundler.patch
-)
-
 all_ruby_unpack() {
 	if [ "${PV}" = "9999" ];then
 		git-2_src_unpack
diff --git a/net-misc/networkmanager-openconnect/Manifest b/net-misc/networkmanager-openconnect/Manifest
index efc7aa656435..b1e71cf14e07 100644
--- a/net-misc/networkmanager-openconnect/Manifest
+++ b/net-misc/networkmanager-openconnect/Manifest
@@ -1,2 +1 @@
-DIST NetworkManager-openconnect-0.9.8.4.tar.xz 409672 SHA256 99b4dc03da311026eaa4bee2ff3f141270e8ba4bf341762d4eeee7152be387b6 SHA512 8356ac68e3f280a6860839284a422177fbc3592d23c3dff28b366165eea2d3c36d7cbd1ea75d027168f6c8fd852a886f85753de55b904105e04b81ae30300dba WHIRLPOOL fc662802c5e75ce6384bc45bd4e1abb66043f24f74eb120b2cfea2d3655238cbe215d9ea5ab3236ebe4553a62627309cece3017ac5ea112b8e7c7a23a263f11d
 DIST NetworkManager-openconnect-0.9.8.6.tar.xz 403596 SHA256 b549a9579b6aa189501bf0fcb046844c75bb1e5699ae5ddfca2296a58d0c9b07 SHA512 941c55602636f1e6c12f26c79e48e1d589a368dccb53c33001c6186481e04a3a593cc8fef9c3cb1ed9c439bd997d328450746984c6932db04b1841ce16a87587 WHIRLPOOL b207f96b9b80e4913ae217d50f302f2a2bdb60227fa566a0fafb76a3f931126ef7f9a1a2dd2d37e6d8ea8fdd8d4fad341dd3df4ea9651bd03fd5b093e599eca2
diff --git a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-formchoice.patch b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-formchoice.patch
deleted file mode 100644
index 26dd1966e42a..000000000000
--- a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-formchoice.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From d846b4e5bb9b89c1110d8ae38fd06021f3e4a9f2 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Mon, 30 Dec 2013 17:49:35 -0800
-Subject: [PATCH] auth-dialog: Introduce FORMCHOICE helper macro
-
-libopenconnect >= 3.0 uses a pointer array so we need to change the way
-the "choices" field is accessed.
-
-
-diff --git a/auth-dialog/main.c b/auth-dialog/main.c
-index 2d8c830..9b32f61 100644
---- a/auth-dialog/main.c
-+++ b/auth-dialog/main.c
-@@ -70,6 +70,8 @@
- #define __openconnect_set_token_mode openconnect_set_token_mode
- #endif
- 
-+#define FORMCHOICE(sopt, i)		(&(sopt)->choices[i])
-+
- #ifdef OPENCONNECT_OPENSSL
- #include <openssl/ssl.h>
- #include <openssl/bio.h>
-@@ -350,10 +352,10 @@ static void combo_changed(GtkComboBox *combo, ui_fragment_data *data)
- 	if (entry < 0)
- 		return;
- 
--	data->entry_text = sopt->choices[entry].name;
-+	data->entry_text = FORMCHOICE(sopt, entry)->name;
- 
- 	g_queue_foreach(data->ui_data->form_entries, (GFunc)do_override_label,
--			&sopt->choices[entry]);
-+			FORMCHOICE(sopt, entry));
- }
- 
- #ifdef OPENCONNECT_OPENSSL
-@@ -449,17 +451,17 @@ static gboolean ui_add_select (ui_fragment_data *data)
- 	combo = gtk_combo_box_text_new();
- 	gtk_box_pack_end(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
- 	for (i = 0; i < sopt->nr_choices; i++) {
--		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), sopt->choices[i].label);
-+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), FORMCHOICE(sopt, i)->label);
- 		if (data->entry_text &&
--		    !strcmp(data->entry_text, sopt->choices[i].name)) {
-+		    !strcmp(data->entry_text, FORMCHOICE(sopt, i)->name)) {
- 			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i);
- 			g_free(data->entry_text);
--			data->entry_text = sopt->choices[i].name;
-+			data->entry_text = FORMCHOICE(sopt, i)->name;
- 		}
- 	}
- 	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) < 0) {
- 		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); 
--		data->entry_text = sopt->choices[0].name;
-+		data->entry_text = FORMCHOICE(sopt, 0)->name;
- 	}
- 
- 	if (g_queue_peek_tail(ui_data->form_entries) == data)
---
-Gitg
-
diff --git a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-ignore.patch b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-ignore.patch
deleted file mode 100644
index 2bda8e529c5a..000000000000
--- a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-ignore.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From e2144cbd1b7f71c2fc57264f125ef298c60f22b7 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Mon, 30 Dec 2013 17:49:37 -0800
-Subject: [PATCH] auth-dialog: Add support for OC_FORM_OPT_IGNORE
-
-Hide any options that libopenconnect doesn't want us to display.
-
-
-diff --git a/auth-dialog/main.c b/auth-dialog/main.c
-index 4ab28cb..2174ea8 100644
---- a/auth-dialog/main.c
-+++ b/auth-dialog/main.c
-@@ -75,11 +75,13 @@
- #define AUTHGROUP_OPT(form)		(void *)(form)->authgroup_opt
- #define AUTHGROUP_SELECTION(form)	(form)->authgroup_selection
- #define FORMCHOICE(sopt, i)		((sopt)->choices[i])
-+#define IGNORE_OPT(opt)			((opt)->flags & OC_FORM_OPT_IGNORE)
- #else
- #define NEWGROUP_SUPPORTED		0
- #define AUTHGROUP_OPT(form)		NULL
- #define AUTHGROUP_SELECTION(form)	0
- #define FORMCHOICE(sopt, i)		(&(sopt)->choices[i])
-+#define IGNORE_OPT(opt)			0
- #define OC_FORM_RESULT_ERR		-1
- #define OC_FORM_RESULT_OK		0
- #define OC_FORM_RESULT_CANCELLED	1
-@@ -704,7 +706,8 @@ static gboolean ui_form (struct oc_auth_form *form)
- 	for (opt = form->opts; opt; opt = opt->next) {
- 		ui_fragment_data *data;
- 
--		if (opt->type == OC_FORM_OPT_HIDDEN)
-+		if (opt->type == OC_FORM_OPT_HIDDEN ||
-+		    IGNORE_OPT(opt))
- 			continue;
- 
- 		data = g_slice_new0 (ui_fragment_data);
---
-Gitg
-
diff --git a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-newgroup.patch b/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-newgroup.patch
deleted file mode 100644
index fe6f8ad5cfd9..000000000000
--- a/net-misc/networkmanager-openconnect/files/networkmanager-openconnect-0.9.8.4-auth-dialog-newgroup.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From 944389128a6cd95b7e6a3e9e4c7700528e6c14b0 Mon Sep 17 00:00:00 2001
-From: Kevin Cernekee <cernekee@gmail.com>
-Date: Mon, 30 Dec 2013 17:49:36 -0800
-Subject: [PATCH] auth-dialog: Add support for NEWGROUP
-
-When the user selects a different authgroup, return NEWGROUP to
-libopenconnect to allow it to refresh the form.  Different groups may
-require different prompts.
-
-Also, if secondary_username is provided by the server, prepopulate the
-form field.
-
-[dwmw2: Update to use form->authgrop_opt and fix crash due to calling
-        gtk_dialog_response() from combo_changed callback.]
-
-
-diff --git a/auth-dialog/main.c b/auth-dialog/main.c
-index 9b32f61..4ab28cb 100644
---- a/auth-dialog/main.c
-+++ b/auth-dialog/main.c
-@@ -70,7 +70,21 @@
- #define __openconnect_set_token_mode openconnect_set_token_mode
- #endif
- 
-+#if OPENCONNECT_CHECK_VER(3,0)
-+#define NEWGROUP_SUPPORTED		1
-+#define AUTHGROUP_OPT(form)		(void *)(form)->authgroup_opt
-+#define AUTHGROUP_SELECTION(form)	(form)->authgroup_selection
-+#define FORMCHOICE(sopt, i)		((sopt)->choices[i])
-+#else
-+#define NEWGROUP_SUPPORTED		0
-+#define AUTHGROUP_OPT(form)		NULL
-+#define AUTHGROUP_SELECTION(form)	0
- #define FORMCHOICE(sopt, i)		(&(sopt)->choices[i])
-+#define OC_FORM_RESULT_ERR		-1
-+#define OC_FORM_RESULT_OK		0
-+#define OC_FORM_RESULT_CANCELLED	1
-+#define OC_FORM_RESULT_NEWGROUP		2
-+#endif
- 
- #ifdef OPENCONNECT_OPENSSL
- #include <openssl/ssl.h>
-@@ -185,6 +199,9 @@ typedef struct auth_ui_data {
- 	GCond *form_shown_changed;
- 	gboolean form_shown;
- 
-+	gboolean newgroup;
-+	gboolean group_set;
-+
- 	GCond *cert_response_changed;
- 	enum certificate_response cert_response;
- 
-@@ -291,6 +308,7 @@ typedef struct ui_fragment_data {
- #endif
- 	struct oc_form_opt *opt;
- 	char *entry_text;
-+	int initial_selection;
- 	int grab_focus;
- } ui_fragment_data;
- 
-@@ -345,6 +363,13 @@ static void do_override_label(ui_fragment_data *data, struct oc_choice *choice)
- 	gtk_label_set_text(GTK_LABEL(data->widget), new_label);
- 
- }
-+
-+static gboolean do_newgroup(GtkDialog *dialog)
-+{
-+	gtk_dialog_response(dialog, AUTH_DIALOG_RESPONSE_LOGIN);
-+	return FALSE;
-+}
-+
- static void combo_changed(GtkComboBox *combo, ui_fragment_data *data)
- {
- 	struct oc_form_opt_select *sopt = (void *)data->opt;
-@@ -354,6 +379,12 @@ static void combo_changed(GtkComboBox *combo, ui_fragment_data *data)
- 
- 	data->entry_text = FORMCHOICE(sopt, entry)->name;
- 
-+	if (NEWGROUP_SUPPORTED && entry != data->initial_selection) {
-+		data->ui_data->newgroup = TRUE;
-+		g_idle_add ((GSourceFunc)do_newgroup, data->ui_data->dialog);
-+		return;
-+	}
-+
- 	g_queue_foreach(data->ui_data->form_entries, (GFunc)do_override_label,
- 			FORMCHOICE(sopt, entry));
- }
-@@ -436,7 +467,7 @@ static gboolean ui_add_select (ui_fragment_data *data)
- 	auth_ui_data *ui_data = _ui_data; /* FIXME global */
- 	GtkWidget *hbox, *text, *combo;
- 	struct oc_form_opt_select *sopt = (void *)data->opt;
--	int i;
-+	int i, user_selection = -1;
- 
- #if GTK_CHECK_VERSION(3,1,6)
- 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-@@ -450,20 +481,21 @@ static gboolean ui_add_select (ui_fragment_data *data)
- 
- 	combo = gtk_combo_box_text_new();
- 	gtk_box_pack_end(GTK_BOX(hbox), combo, FALSE, FALSE, 0);
-+
- 	for (i = 0; i < sopt->nr_choices; i++) {
- 		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), FORMCHOICE(sopt, i)->label);
- 		if (data->entry_text &&
--		    !strcmp(data->entry_text, FORMCHOICE(sopt, i)->name)) {
--			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i);
--			g_free(data->entry_text);
--			data->entry_text = FORMCHOICE(sopt, i)->name;
--		}
--	}
--	if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) < 0) {
--		gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0); 
--		data->entry_text = FORMCHOICE(sopt, 0)->name;
-+		    !strcmp(data->entry_text, FORMCHOICE(sopt, i)->name))
-+			user_selection = i;
- 	}
- 
-+	i = data->initial_selection != -1 ? data->initial_selection :
-+	    user_selection != -1 ? user_selection : 0;
-+	gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i);
-+	g_free(data->entry_text);
-+	data->entry_text = FORMCHOICE(sopt, i)->name;
-+	data->initial_selection = i;
-+
- 	if (g_queue_peek_tail(ui_data->form_entries) == data)
- 		gtk_widget_grab_focus (combo);
- 	g_signal_connect(G_OBJECT(combo), "changed", G_CALLBACK(combo_changed), data);
-@@ -684,10 +716,12 @@ static gboolean ui_form (struct oc_auth_form *form)
- 			g_mutex_lock (ui_data->form_mutex);
- 			g_queue_push_head(ui_data->form_entries, data);
- 			g_mutex_unlock (ui_data->form_mutex);
--			if (opt->type != OC_FORM_OPT_PASSWORD)
-+			if (opt->type != OC_FORM_OPT_PASSWORD) {
- 				data->entry_text = g_strdup (find_form_answer(ui_data->secrets,
- 									      form, opt));
--			else {
-+				if (!data->entry_text)
-+					data->entry_text = g_strdup (opt->value);
-+			} else {
- 				data->find_request = gnome_keyring_find_password(
- 						OPENCONNECT_SCHEMA,
- 						got_keyring_pw,
-@@ -709,6 +743,11 @@ static gboolean ui_form (struct oc_auth_form *form)
- 			data->entry_text = g_strdup (find_form_answer(ui_data->secrets,
- 								      form, opt));
- 
-+			if (opt == AUTHGROUP_OPT(form))
-+				data->initial_selection = AUTHGROUP_SELECTION(form);
-+			else
-+				data->initial_selection = -1;
-+
- 			ui_add_select(data);
- 		} else
- 			g_slice_free (ui_fragment_data, data);
-@@ -717,11 +756,51 @@ static gboolean ui_form (struct oc_auth_form *form)
- 	return ui_show(ui_data);
- }
- 
-+/* If our stored group_list selection differs from the server default, send a
-+   NEWGROUP request to try to change it before rendering the form */
-+
-+static gboolean set_initial_authgroup (auth_ui_data *ui_data, struct oc_auth_form *form)
-+{
-+	struct oc_form_opt *opt;
-+
-+	if (!NEWGROUP_SUPPORTED || ui_data->group_set || !AUTHGROUP_OPT(form))
-+		return FALSE;
-+	ui_data->group_set = TRUE;
-+
-+	for (opt = form->opts; opt; opt = opt->next) {
-+		int i;
-+		char *saved_group;
-+		struct oc_form_opt_select *sopt;
-+
-+		if (opt != AUTHGROUP_OPT(form))
-+			continue;
-+
-+		saved_group = find_form_answer(ui_data->secrets, form, opt);
-+		if (!saved_group)
-+			return FALSE;
-+
-+		sopt = (struct oc_form_opt_select *)opt;
-+		for (i = 0; i < sopt->nr_choices; i++) {
-+			struct oc_choice *ch = FORMCHOICE(sopt, i);
-+			if (!strcmp(saved_group, ch->name) && i != AUTHGROUP_SELECTION(form)) {
-+				free(opt->value);
-+				opt->value = g_strdup(saved_group);
-+				return TRUE;
-+			}
-+		}
-+	}
-+	return FALSE;
-+}
-+
- static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form)
- {
- 	auth_ui_data *ui_data = cbdata;
- 	int response;
- 
-+	if (set_initial_authgroup(ui_data, form))
-+		return OC_FORM_RESULT_NEWGROUP;
-+
-+	ui_data->newgroup = FALSE;
- 	g_idle_add((GSourceFunc)ui_form, form);
- 
- 	g_mutex_lock(ui_data->form_mutex);
-@@ -782,10 +861,13 @@ static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form)
- 	ui_data->form_grabbed = 0;
- 	g_mutex_unlock(ui_data->form_mutex);
- 	
--	/* -1 = cancel,
--	 *  0 = failure,
--	 *  1 = success */
--	return (response == AUTH_DIALOG_RESPONSE_LOGIN ? 0 : 1);
-+	if (response == AUTH_DIALOG_RESPONSE_LOGIN) {
-+		if (ui_data->newgroup)
-+			return OC_FORM_RESULT_NEWGROUP;
-+		else
-+			return OC_FORM_RESULT_OK;
-+	} else
-+		return OC_FORM_RESULT_CANCELLED;
- 
- }
- 
---
-Gitg
-
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.4.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.4.ebuild
deleted file mode 100644
index ac26f7b76d03..000000000000
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.4.ebuild,v 1.3 2013/12/08 19:30:06 pacho Exp $
-
-EAPI="5"
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-
-inherit eutils gnome.org gnome2-utils user
-
-DESCRIPTION="NetworkManager OpenConnect plugin"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-0.9.8:=
-	>=dev-libs/dbus-glib-0.74
-	dev-libs/libxml2:2
-	gnome-base/libgnome-keyring
-	>=net-misc/openconnect-3.02:=
-	gtk? (
-		>=x11-libs/gtk+-2.91.4:3
-		gnome-base/gnome-keyring
-	)"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_disable_deprecation_warning
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-more-warnings \
-		--disable-static \
-		--with-gtkver=3 \
-		$(use_with gtk gnome) \
-		$(use_with gtk authdlg)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	enewgroup nm-openconnect
-	enewuser nm-openconnect -1 -1 -1 nm-openconnect
-}
diff --git a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
index bb028dca8b38..e53b9d7c9b67 100644
--- a/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
+++ b/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild,v 1.3 2014/05/04 12:12:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openconnect/networkmanager-openconnect-0.9.8.6.ebuild,v 1.4 2014/06/24 01:29:57 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -25,6 +25,7 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild
index 8820a9cef90e..b75b85963a20 100644
--- a/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild
+++ b/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild,v 1.4 2014/06/13 15:09:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openswan/networkmanager-openswan-0.9.8.4.ebuild,v 1.5 2014/06/24 01:26:10 tetromino Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
@@ -21,6 +21,7 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-3.0.0:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
index f4f622d205af..d593ce9a09db 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild,v 1.4 2013/12/25 09:35:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-openvpn/networkmanager-openvpn-0.9.8.4.ebuild,v 1.5 2014/06/24 01:25:03 tetromino Exp $
 
 EAPI=5
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
@@ -22,6 +22,7 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
index de8871b88746..8f33f54d7bc9 100644
--- a/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
+++ b/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild,v 1.4 2013/12/08 19:31:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-pptp/networkmanager-pptp-0.9.8.4.ebuild,v 1.5 2014/06/24 01:23:05 tetromino Exp $
 
 EAPI=5
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
@@ -23,6 +23,7 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild b/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild
index f73343e8decc..d1ae35e8d1ff 100644
--- a/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild
+++ b/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild,v 1.1 2013/12/29 17:10:44 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-sstp/networkmanager-sstp-0.9.8.ebuild,v 1.2 2014/06/24 01:21:42 tetromino Exp $
 
 EAPI=5
 
@@ -25,6 +25,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.74
 	gtk? (
 		x11-libs/gtk+:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)
 "
 
diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
index 51cfa71ec4dc..8296cb6cadc9 100644
--- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
+++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild,v 1.4 2013/12/08 19:31:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager-vpnc/networkmanager-vpnc-0.9.8.6.ebuild,v 1.5 2014/06/24 01:18:19 tetromino Exp $
 
 EAPI=5
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
@@ -22,6 +22,7 @@ RDEPEND="
 	gtk? (
 		>=x11-libs/gtk+-2.91.4:3
 		gnome-base/gnome-keyring
+		gnome-base/libgnome-keyring
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/net-misc/proxychains/Manifest b/net-misc/proxychains/Manifest
index e5bf823eb3ff..8ccffd6fd6db 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,2 +1,2 @@
-DIST proxychains-3.1_p20110225.tar.xz 178544 SHA256 b3b8f877be14b7bb0c71b298cd658d9937b91f2c31fece2576961fc6602e0f6d SHA512 46e5de03d35590957ceb79f361bfe3ec0a70e59cebd1304ca5feef379035dfda173ad24173758b6d8a9a2a7583fadccca1cee68f9c249b44b0ff646b505b66a5 WHIRLPOOL 3f1a67df49dc520b3bfe8c15e9b4538cbebf226d2da8bf64a15a2bdb66a30acfb6ae513d4ea3b20fa81f02dca8266c1d2e2165c185d66e174d0504a52c8fd717
 DIST proxychains-4.2.0.tar.gz 25167 SHA256 225284e5553fb062d09ed425d2815387eda9c1c0d6e2bc24ea95393a71601619 SHA512 fc5b454e833521467ea62e5e60180fd671dc293ca737683269c63bfee10d2a94e206a9a8ad80d2af0b761421e7e49f377693e8903fdfd0550b66451bbe79a6cf WHIRLPOOL 86e9bd24ea74973d67b0183fe3b7227c1e2b41e74fcaeddd7e7907fe6d7623a87107bb6397e19b8259379aeaf7deaf784289ea069e02974a43f175c32ff619b8
+DIST proxychains-ng-4.7.tar.gz 31635 SHA256 9b0d67d46a108b63d317a3f31825051d838b8d528d3ff0d49f5e3b1dacb76b94 SHA512 8f055698358dfd753a1f5e95f0b12a0ddbadb53f2ecf275db207c6566ff539d31a25675e5474b6a0b43c64f0b1236ccf652c340c50fcbff5a7ea8de9ce8c2b62 WHIRLPOOL 63ce0e80cd2f3e146883d27d50b0c0a19033b67687a21dc142f3fd68ea13eea32c638db84250d271737035c300a6c202476d1264c8c4f182fe0d525e0ebafbbf
diff --git a/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch b/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch
deleted file mode 100644
index a30f756d462c..000000000000
--- a/net-misc/proxychains/files/proxychains-3.1_p20110225-glibc214.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- proxychains-3.1_p20110225/proxychains/core.c
-+++ proxychains-3.1_p20110225/proxychains/core.c
-@@ -178,7 +178,7 @@
-   return size;
- }
- 
--static int timed_connect(int sock, const struct sockaddr *addr, unsigned int len)
-+static int timed_connect(int sock, const struct sockaddr *addr, socklen_t len)
- {
- 	int ret,value,value_len;
-  	struct pollfd pfd[1];
---- proxychains-3.1_p20110225/proxychains/core.h
-+++ proxychains-3.1_p20110225/proxychains/core.h
-@@ -90,7 +90,7 @@
- typedef int (*getnameinfo_t) (const struct sockaddr *,
- 		socklen_t, char *,
- 		socklen_t, char *,
--		socklen_t, unsigned int);
-+		socklen_t, int);
- getnameinfo_t true_getnameinfo;
- 
- typedef struct hostent *(*gethostbyaddr_t) (const void *, socklen_t, int);
---- proxychains-3.1_p20110225/proxychains/libproxychains.c
-+++ proxychains-3.1_p20110225/proxychains/libproxychains.c
-@@ -264,7 +264,7 @@
- 
- 
- 
--int connect (int sock, const struct sockaddr *addr, unsigned int len)
-+int connect(int sock, const struct sockaddr *addr, socklen_t len)
- {
- 	int socktype=0,optlen=0,flags=0,ret=0;
- 	char str[256];
-@@ -354,7 +354,7 @@
- int getnameinfo (const struct sockaddr * sa,
- 			socklen_t salen, char * host,
- 			socklen_t hostlen, char * serv,
--			socklen_t servlen, unsigned int flags)
-+			socklen_t servlen, int flags)
- {
- 	int ret = 0;
- 	if(!init_l)
diff --git a/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch b/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch
deleted file mode 100644
index 0db2e70e6842..000000000000
--- a/net-misc/proxychains/files/proxychains-3.1_p20110225-sysconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- proxychains-3.1_p20110225/proxychains/Makefile.am.orig
-+++ proxychains-3.1_p20110225/proxychains/Makefile.am
-@@ -2,7 +2,7 @@
- 
- EXTRA_DIST = proxychains.conf core.c core.h libproxychains.c 
- 
--sysconf_DATA=$(srcdir)/proxychains.conf
-+sysconf_DATA=proxychains.conf
- 
- install-data-local:
- 	$(mkinstalldirs) ${DESTDIR}${bindir}
diff --git a/net-misc/proxychains/files/proxychains-4.7-makefile.patch b/net-misc/proxychains/files/proxychains-4.7-makefile.patch
new file mode 100644
index 000000000000..4c26d48d326e
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-4.7-makefile.patch
@@ -0,0 +1,46 @@
+--- proxychains-ng-4.7/Makefile
++++ proxychains-ng-4.7/Makefile
+@@ -20,10 +20,8 @@
+         src/allocator_thread.o src/ip_type.o src/stringdump.o \
+         src/hostentdb.o src/hash.o src/debug.o
+ 
+-CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+-NO_AS_NEEDED = -Wl,--no-as-needed
+-LIBDL   = -ldl
+-LDFLAGS = -shared -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
++CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
++LIBS    = -ldl -lpthread
+ INC     = 
+ PIC     = -fPIC
+ AR      = $(CROSS_COMPILE)ar
+@@ -33,11 +31,11 @@
+ LD_SET_SONAME = -Wl,-soname=
+ INSTALL_FLAGS = -D -m
+ 
+-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+ 
+ SHARED_LIBS = $(LDSO_PATHNAME)
+ ALL_LIBS = $(SHARED_LIBS)
+-PXCHAINS = proxychains4
++PXCHAINS = proxychains
+ ALL_TOOLS = $(PXCHAINS)
+ 
+ -include config.mak
+@@ -63,13 +61,13 @@
+ 	rm -f $(OBJS)
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+ 
+ $(LDSO_PATHNAME): $(LOBJS)
+-	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS)
++	$(CC) $(LDFLAGS) -shared $(PIC) $(LD_SET_SONAME)$(LDSO_PATHNAME) -o $@ $(LOBJS) $(LIBS)
+ 
+ $(ALL_TOOLS): $(OBJS)
+-	$(CC) src/main.o src/common.o -o $(PXCHAINS)
++	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS) $(LIBS)
+ 
+ 
+ .PHONY: all clean install install-config
diff --git a/net-misc/proxychains/proxychains-3.1_p20110225-r1.ebuild b/net-misc/proxychains/proxychains-3.1_p20110225-r1.ebuild
deleted file mode 100644
index a41f9ca21419..000000000000
--- a/net-misc/proxychains/proxychains-3.1_p20110225-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-3.1_p20110225-r1.ebuild,v 1.4 2012/12/26 18:08:01 jdhore Exp $
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils
-
-DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
-HOMEPAGE="http://proxychains.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="static-libs"
-
-DEPEND="app-arch/xz-utils"
-RDEPEND="net-dns/bind-tools"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc214.patch
-	"${FILESDIR}"/${P}-sysconf.patch
-)
diff --git a/net-misc/proxychains/proxychains-4.7.ebuild b/net-misc/proxychains/proxychains-4.7.ebuild
new file mode 100644
index 000000000000..ad797de0a1c0
--- /dev/null
+++ b/net-misc/proxychains/proxychains-4.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/proxychains/proxychains-4.7.ebuild,v 1.2 2014/06/23 17:39:32 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils multilib
+
+MY_PN=${PN}-ng
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
+SRC_URI="https://github.com/rofl0r/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		|| die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS ChangeLog README TODO
+
+	dolib.so lib${PN}.so.${PV}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
index e1c42cbada12..bd26b1c386d4 100644
--- a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
+++ b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r3.ebuild,v 1.8 2014/06/14 10:29:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r3.ebuild,v 1.9 2014/06/24 09:30:17 nimiux Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
 
 DEPEND="nls? ( dev-python/Babel )"
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
new file mode 100644
index 000000000000..d5a728c9bfad
--- /dev/null
+++ b/net-misc/yandex-disk/Manifest
@@ -0,0 +1,2 @@
+DIST yandex-disk-0.1.4.504-1.fedora.i386.rpm 3953847 SHA256 0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426 SHA512 e5b6dde64b22a94dccbc354d26c5f565eb26430ae06ab39d089ad147f9ab39d7df91c43fb4841060eb148a319d1d761e1dd30381c87583c02035c56c39b2b75c WHIRLPOOL c0b348c1c4e502d67398a74fe8bdb78070ca97ae82493d26cc06a25890078bd68c05a4ef8cfe17ad506115634f86fd8cef0f89ae50f0c3af2e8874b0455b12c8
+DIST yandex-disk-0.1.4.504-1.fedora.x86_64.rpm 4342884 SHA256 5c0a140dfc60a5decbbffa2963fe9c67fae1fc0961fdc042dfa36f8d813b7c26 SHA512 7788ba6ddedc4e88ae6489454eef225475a34e23dfd5a34405597004a25412f125a5ed1c1e0b11e688cb92c46040c7ee14e3b30a161b92f7987fdc9416bb3dcd WHIRLPOOL 5cfe5eee3d04128da8e9c7b391383d39507cabc4b53c1665be9ce54cb9ad3aed6fab68de6d6915191ca5b360375d27de44a694d2cd119d054764573d7200c320
diff --git a/net-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml
new file mode 100644
index 000000000000..9ef9c615e0c0
--- /dev/null
+++ b/net-misc/yandex-disk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>blueboar@gentoo.org</email>
+		<name>Vladimir Romanov</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer>
+		<email>pinkbyte@gentoo.org</email>
+		<name>Sergey Popov</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.4.504_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.4.504_p1.ebuild
new file mode 100644
index 000000000000..d270b85fd1ad
--- /dev/null
+++ b/net-misc/yandex-disk/yandex-disk-0.1.4.504_p1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/yandex-disk/yandex-disk-0.1.4.504_p1.ebuild,v 1.1 2014/06/24 07:52:42 pinkbyte Exp $
+
+EAPI=5
+
+inherit bash-completion-r1 rpm
+
+MY_P="${PN}-${PV/_p/-}"
+
+DESCRIPTION="CLI to access Yandex Disk file storage service"
+HOMEPAGE="https://disk.yandex.ru"
+SRC_URI="
+	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
+	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
+"
+
+LICENSE="YDSLA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="sys-libs/zlib"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/bin/yandex-disk"
+
+src_install() {
+	exeinto /opt/bin
+	doexe usr/bin/yandex-disk
+	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
+}
diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild
new file mode 100644
index 000000000000..0f0cf476c32e
--- /dev/null
+++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-6.30.223.141-r2.ebuild,v 1.1 2014/06/23 17:49:08 swift Exp $
+
+EAPI="5"
+inherit eutils linux-info linux-mod
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver"
+HOMEPAGE="http://www.broadcom.com/support/802.11/linux_sta.php"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )"
+
+LICENSE="Broadcom"
+KEYWORDS="-* ~amd64 ~x86"
+
+RESTRICT="mirror"
+
+DEPEND="virtual/linux-sources"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+MODULE_NAMES="wl(net/wireless)"
+MODULESD_WL_ALIASES=("wlan0 wl")
+
+pkg_setup() {
+	# bug #300570
+	# NOTE<lxnay>: module builds correctly anyway with b43 and SSB enabled
+	# make checks non-fatal. The correct fix is blackisting ssb and, perhaps
+	# b43 via udev rules. Moreover, previous fix broke binpkgs support.
+	CONFIG_CHECK="~!B43 ~!SSB"
+	CONFIG_CHECK2="LIB80211 ~!MAC80211 ~LIB80211_CRYPT_TKIP"
+	ERROR_B43="B43: If you insist on building this, you must blacklist it!"
+	ERROR_SSB="SSB: If you insist on building this, you must blacklist it!"
+	ERROR_LIB80211="LIB80211: Please enable it. If you can't find it: enabling the driver for \"Intel PRO/Wireless 2100\" or \"Intel PRO/Wireless 2200BG\" (IPW2100 or IPW2200) should suffice."
+	ERROR_MAC80211="MAC80211: If you insist on building this, you must blacklist it!"
+	ERROR_PREEMPT_RCU="PREEMPT_RCU: Please do not set the Preemption Model to \"Preemptible Kernel\"; choose something else."
+	ERROR_LIB80211_CRYPT_TKIP="LIB80211_CRYPT_TKIP: You will need this for WPA."
+	if kernel_is ge 3 8 8; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211 ~!PREEMPT_RCU ~!PREEMPT"
+	elif kernel_is ge 2 6 32; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} CFG80211"
+	elif kernel_is ge 2 6 31; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT ~!MAC80211"
+	elif kernel_is ge 2 6 29; then
+		CONFIG_CHECK="${CONFIG_CHECK} ${CONFIG_CHECK2} WIRELESS_EXT COMPAT_NET_DEV_OPS"
+	else
+		CONFIG_CHECK="${CONFIG_CHECK} IEEE80211 IEEE80211_CRYPT_TKIP"
+	fi
+
+	linux-mod_pkg_setup
+
+	BUILD_PARAMS="-C ${KV_DIR} M=${S}"
+	BUILD_TARGETS="wl.ko"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-license.patch" \
+		"${FILESDIR}/${P}-makefile.patch" \
+		"${FILESDIR}/${P}-linux-recent.patch" \
+		"${FILESDIR}/${P}-eth-to-wlan.patch" \
+		"${FILESDIR}/${P}-gcc.patch" \
+		"${FILESDIR}/${P}-linux-3.15.patch"
+
+	epatch_user
+}
diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch
new file mode 100644
index 000000000000..5596c0ebcf2e
--- /dev/null
+++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.141-linux-3.15.patch
@@ -0,0 +1,17 @@
+Add channel parameter to cfg80211_ibss_joined call
+
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -1841,7 +1841,12 @@ wl_notify_connect_status(struct wl_cfg80211_priv *wl, struct net_device *ndev,
+ 			wl_get_assoc_ies(wl);
+ 			memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
+ 			wl_update_bss_info(wl);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0)
+ 			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
++#else
++			cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid,
++			                     &wl->conf->channel, GFP_KERNEL);
++#endif
+ 			set_bit(WL_STATUS_CONNECTED, &wl->status);
+ 			wl->profile->active = true;
+ 		}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0742842e8647..d39026ecf781 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6787,7 +6787,7 @@ sys-fs/cryptsetup:nettle - Use dev-libs/nettle crypto backend
 sys-fs/cryptsetup:openssl - Use dev-libs/openssl crypto backend
 sys-fs/cryptsetup:reencrypt - Build cryptsetup-reencrypt
 sys-fs/cryptsetup:urandom - Use /dev/urandom instead of /dev/random
-sys-fs/dd-rescue:sse4_2 - Use the SSE4.1 instruction set
+sys-fs/dd-rescue:sse4_2 - Use the SSE4.2 instruction set
 sys-fs/dmraid:dietlibc - Compile against dev-libs/dietlibc
 sys-fs/dmraid:intel_led - Enable Intel LED support
 sys-fs/dmraid:klibc - Compile against dev-libs/klibc
diff --git a/sys-apps/dbus/dbus-1.8.4.ebuild b/sys-apps/dbus/dbus-1.8.4.ebuild
index 55bd939b5143..4830268a57e1 100644
--- a/sys-apps/dbus/dbus-1.8.4.ebuild
+++ b/sys-apps/dbus/dbus-1.8.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild,v 1.3 2014/06/20 13:16:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild,v 1.4 2014/06/23 15:37:21 phajdan.jr Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -12,7 +12,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="debug doc selinux static-libs systemd test X"
 
 RDEPEND=">=dev-libs/expat-2
diff --git a/sys-cluster/swift/files/CVE-2014-3497-1.13.patch b/sys-cluster/swift/files/CVE-2014-3497-1.13.patch
new file mode 100644
index 000000000000..9164933849b5
--- /dev/null
+++ b/sys-cluster/swift/files/CVE-2014-3497-1.13.patch
@@ -0,0 +1,88 @@
+https://review.openstack.org/gitweb?p=openstack%2Fswift.git;a=commitdiff;h=b223322ed1ef44f61490f820240aa01f1047ae2e
+author	John Dickinson <me@not.mn>	
+	Sat, 7 Jun 2014 02:46:41 +0800 (11:46 -0700)
+committer	John Dickinson <me@not.mn>	
+	Thu, 19 Jun 2014 06:28:33 +0800 (15:28 -0700)
+HTTP header values should be quoted. Since the WWW-Authenticate
+header value contains user-supplied strings, it's important to
+ensure it's properly quoted to ensure the integrity of the protocol.
+
+Previous to this patch, the URL was unquoted and then the unquoted
+value was returned in the header. This patch re-quotes the value
+when it is set on the response.
+
+This is filed as CVS-2014-3497
+
+Fixes bug 1327414
+
+Change-Id: If8bd8842f2ce821756e9b4461a18a8ac8d42fb8c
+diff --git a/swift/common/swob.py b/swift/common/swob.py
+index 638086e..f4f38c7 100644 (file)
+--- a/swift/common/swob.py
++++ b/swift/common/swob.py
+@@ -1203,7 +1203,7 @@ class Response(object):
+                 realm = 'unknown'
+         except (AttributeError, ValueError):
+             realm = 'unknown'
+-        return 'Swift realm="%s"' % realm
++        return 'Swift realm="%s"' % urllib2.quote(realm)
+ 
+     @property
+     def is_success(self):
+diff --git a/test/functional/tests.py b/test/functional/tests.py
+index ad8c398..7983815 100644 (file)
+--- a/test/functional/tests.py
++++ b/test/functional/tests.py
+@@ -333,6 +333,19 @@ class TestAccount(Base):
+             self.assertEqual(sorted(containers, cmp=locale.strcoll),
+                              containers)
+ 
++    def testQuotedWWWAuthenticateHeader(self):
++        conn = Connection(config)
++        conn.authenticate()
++        inserted_html = '<b>Hello World'
++        hax = 'AUTH_haxx"\nContent-Length: %d\n\n%s' % (len(inserted_html),
++                                                        inserted_html)
++        quoted_hax = urllib.quote(hax)
++        conn.connection.request('GET', '/v1/' + quoted_hax, None, {})
++        resp = conn.connection.getresponse()
++        resp_headers = resp.getheaders()
++        expected = ('www-authenticate', 'Swift realm="%s"' % quoted_hax)
++        self.assert_(expected in resp_headers)
++
+ 
+ class TestAccountUTF8(Base2, TestAccount):
+     set_up = False
+diff --git a/test/unit/common/test_swob.py b/test/unit/common/test_swob.py
+index 7cc5439..b0452b9 100644 (file)
+--- a/test/unit/common/test_swob.py
++++ b/test/unit/common/test_swob.py
+@@ -601,6 +601,28 @@ class TestRequest(unittest.TestCase):
+         self.assertEquals('Me realm="whatever"',
+                           resp.headers['Www-Authenticate'])
+ 
++    def test_401_www_authenticate_is_quoted(self):
++
++        def test_app(environ, start_response):
++            start_response('401 Unauthorized', [])
++            return ['hi']
++
++        hacker = 'account-name\n\n<b>foo<br>'  # url injection test
++        quoted_hacker = quote(hacker)
++        req = swift.common.swob.Request.blank('/v1/' + hacker)
++        resp = req.get_response(test_app)
++        self.assertEquals(resp.status_int, 401)
++        self.assert_('Www-Authenticate' in resp.headers)
++        self.assertEquals('Swift realm="%s"' % quoted_hacker,
++                          resp.headers['Www-Authenticate'])
++
++        req = swift.common.swob.Request.blank('/v1/' + quoted_hacker)
++        resp = req.get_response(test_app)
++        self.assertEquals(resp.status_int, 401)
++        self.assert_('Www-Authenticate' in resp.headers)
++        self.assertEquals('Swift realm="%s"' % quoted_hacker,
++                          resp.headers['Www-Authenticate'])
++
+     def test_not_401(self):
+ 
+         # Other status codes should not have WWW-Authenticate in response
diff --git a/sys-cluster/swift/swift-1.13.0.ebuild b/sys-cluster/swift/swift-1.13.0-r1.ebuild
similarity index 97%
rename from sys-cluster/swift/swift-1.13.0.ebuild
rename to sys-cluster/swift/swift-1.13.0-r1.ebuild
index 50ef0378a9a4..ff9b0701705c 100644
--- a/sys-cluster/swift/swift-1.13.0.ebuild
+++ b/sys-cluster/swift/swift-1.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.0.ebuild,v 1.1 2014/04/06 05:30:17 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.0-r1.ebuild,v 1.1 2014/06/24 09:49:27 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -49,7 +49,7 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
 ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
 ~ZFS"
 
-#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
+PATCHES=( "${FILESDIR}/"CVE-2014-3497-1.13.patch )
 
 pkg_setup() {
 	enewuser swift
diff --git a/sys-cluster/swift/swift-1.13.1.ebuild b/sys-cluster/swift/swift-1.13.1-r1.ebuild
similarity index 97%
rename from sys-cluster/swift/swift-1.13.1.ebuild
rename to sys-cluster/swift/swift-1.13.1-r1.ebuild
index 27c96b669e06..359d5c792530 100644
--- a/sys-cluster/swift/swift-1.13.1.ebuild
+++ b/sys-cluster/swift/swift-1.13.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.1.ebuild,v 1.1 2014/04/28 01:22:27 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.1-r1.ebuild,v 1.1 2014/06/24 09:49:27 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -46,7 +46,7 @@ CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
 ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
 ~ZFS"
 
-#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
+PATCHES=( "${FILESDIR}/"CVE-2014-3497-1.13.patch )
 
 pkg_setup() {
 	enewuser swift
diff --git a/sys-devel/clang/clang-3.4.2-r100.ebuild b/sys-devel/clang/clang-3.4.2-r100.ebuild
new file mode 100644
index 000000000000..ad0a80040c5f
--- /dev/null
+++ b/sys-devel/clang/clang-3.4.2-r100.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.4.2-r100.ebuild,v 1.1 2014/06/23 23:01:02 voyageur Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
+HOMEPAGE="http://clang.llvm.org/"
+SRC_URI=""
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.4"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug multitarget python +static-analyzer"
+
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer,${MULTILIB_USEDEP}]"
+
+# Please keep this package around since it's quite likely that we'll
+# return to separate LLVM & clang ebuilds when the cmake build system
+# is complete.
+
+pkg_postinst() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" ; then
+		#add ccache links as clang might get installed after ccache
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
+
+pkg_postrm() {
+	if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		# --remove-links would remove all links, --install-links updates them
+		"${EROOT}"/usr/bin/ccache-config --install-links
+	fi
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 61be603defd4..35616cfaab80 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,6 @@
 DIST cfe-3.3.src.tar.gz 9425539 SHA256 b1b55de4ab3a57d3e0331a83e0284610191c77d924e3446498d9113d08dfb996 SHA512 06773f43f7d3529f06edb029f7de398f06a700a0f2476e00c4727e70c291028221bfac23625dfd2c220d6ac91a21670848187a934b99a21801c695127371afcc WHIRLPOOL 8b97b527f19015dd3283b9e174615170e639793f64c635ccc4ee4d8216f8de759fd0121a8ef3513fa1c6ad19b31aa3529091ffb44a01ee858edfef400881596a
 DIST cfe-3.4.1.src.tar.gz 10611194 SHA256 ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7 SHA512 3886d2e362aab52f29520150a81271ee24433118e0519dd5d1c58cfacc3b1c7da4cbab49c7e82d6b4a90c278b5028f5aa1f5d79478b13d0b11a15c491a6c00d5 WHIRLPOOL efd86062ae15fc6356faeaa2d094a22f7c0def5ec01d5f65b06b3fef41edb60e76f3f892f751dc5da50c7d2b79e3c24b2e5e6ae69330b9947aeaebce5c390766
+DIST cfe-3.4.2.src.tar.gz 10612313 SHA256 5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d WHIRLPOOL 153208b1a60bb5fbe92a7162cb26bbe70d591e7db9dcf06fcd54efc539bbff0403ec88e64236969c9f256e5586bc333840bd6178fd158577d6fe228d9edd4dcd
 DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512 9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1 WHIRLPOOL c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
 DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256 0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512 3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929 WHIRLPOOL fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
 DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256 f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512 70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8 WHIRLPOOL ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
@@ -13,3 +14,4 @@ DIST llvm-3.3-manpages.tar.bz2 27098 SHA256 46bb22d63d5fe7dd04e1a7bb7e16c03d93f2
 DIST llvm-3.3.src.tar.gz 13602421 SHA256 68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 SHA512 1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038 WHIRLPOOL a89c0b470fde562a3402e7878b91bc0573d433ca0a60e62c9c46946d7948a4fb657b116b6bac032555e29c70d82c751876adb398fe240f5c8d0a9a2378ce1866
 DIST llvm-3.4-manpages.tar.bz2 33753 SHA256 dc2616104cf333dd9ef56b2d31f9a36e81303e2c5756ff8bc221e05b46f7e1cb SHA512 8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d WHIRLPOOL 1c037a9972442937f84bc3147d77d4bbc6d6c0812c3025f3107c2ee5f6259afab990f6e1bca564237fdca8089e2372df4b7ca45cbdea686fbf891f92d1bfbbe6
 DIST llvm-3.4.1.src.tar.gz 15937474 SHA256 7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a SHA512 a8d19f8560604cd1a62b9868aca8848c0675895c5354dfcbc81ef940d4a38f56f8239a49aec853dd7d432134fa0b5feb9b070579226400874b761dcf124f7a7b WHIRLPOOL 9d5cc43159ffd93ae30ce5a8b88110a24f2da0721d3b87c53cbba7d5e484a1a7ddaf3b0e52341ee7ba6bbdba7ba2ba2f0d72cb11640f50f11ede9df10e0ee72e
+DIST llvm-3.4.2.src.tar.gz 15938155 SHA256 17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7 SHA512 6c1453f7d9d9110257db3574cc4f6227fed8938705cbb09851ac09a868089b48f1556a1b6e758aff6d97520b08b5605d3ed20411ad9dd22cdc573d62176905f0 WHIRLPOOL f8b4d5167469e6f350ec41aede04e7b756e18f3d8e78b3270beb5791310a7b9b13c69e57c8bcfefbd0a78efc0c40e3b75a9a158eac72c025b7c77146e8dfaf7c
diff --git a/sys-devel/llvm/llvm-3.4.2.ebuild b/sys-devel/llvm/llvm-3.4.2.ebuild
new file mode 100644
index 000000000000..54a5642093ec
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.4.2.ebuild
@@ -0,0 +1,518 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.1 2014/06/23 23:00:42 voyageur Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+# this causes some issues so make it optional for now.
+# 3.5 will have CMakeFiles support in autotools.
+WANT_CMAKE=cmake
+
+inherit cmake-utils eutils flag-o-matic multibuild multilib \
+	multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
+	clang? ( http://llvm.org/releases/${PV}/compiler-rt-3.4.src.tar.gz
+		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz
+		http://llvm.org/releases/${PV}/clang-tools-extra-3.4.src.tar.gz )
+	!doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.4-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.4"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
+	+static-analyzer test udis86 xml video_cards_radeon
+	kernel_Darwin kernel_FreeBSD"
+
+COMMON_DEPEND="
+	sys-libs/zlib:0=
+	clang? (
+		python? ( ${PYTHON_DEPS} )
+		static-analyzer? (
+			dev-lang/perl:*
+			${PYTHON_DEPS}
+		)
+		xml? ( dev-libs/libxml2:2= )
+	)
+	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+	libffi? ( virtual/libffi:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( sys-libs/ncurses:5=[${MULTILIB_USEDEP}] )
+	ocaml? ( dev-lang/ocaml:0= )
+	udis86? ( dev-libs/udis86:0=[pic(+),${MULTILIB_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=sys-devel/make-3.81
+	>=sys-devel/flex-2.5.4
+	>=sys-devel/bison-1.875d
+	|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
+		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+	)
+	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
+	clang? ( xml? ( virtual/pkgconfig ) )
+	doc? ( dev-python/sphinx )
+	libffi? ( virtual/pkgconfig )
+	${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+	clang? ( !<=sys-devel/clang-3.4-r99
+		!>=sys-devel/clang-9999 )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( || ( $(python_gen_useflags 'python*') ) )"
+
+S=${WORKDIR}/${P}.src
+
+# Some people actually override that in make.conf. That sucks since
+# we need to run install per-directory, and ninja can't do that...
+# so why did it call itself ninja in the first place?
+CMAKE_MAKEFILE_GENERATOR=emake
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/llvm-config
+)
+
+pkg_pretend() {
+	# in megs
+	# !clang !debug !multitarget -O2       400
+	# !clang !debug  multitarget -O2       550
+	#  clang !debug !multitarget -O2       950
+	#  clang !debug  multitarget -O2      1200
+	# !clang  debug  multitarget -O2      5G
+	#  clang !debug  multitarget -O0 -g  12G
+	#  clang  debug  multitarget -O2     16G
+	#  clang  debug  multitarget -O0 -g  14G
+
+	local build_size=550
+	use clang && build_size=1200
+
+	if use debug; then
+		ewarn "USE=debug is known to increase the size of package considerably"
+		ewarn "and cause the tests to fail."
+		ewarn
+
+		(( build_size *= 14 ))
+	elif is-flagq -g || is-flagq -ggdb; then
+		ewarn "The C++ compiler -g option is known to increase the size of the package"
+		ewarn "considerably. If you run out of space, please consider removing it."
+		ewarn
+
+		(( build_size *= 10 ))
+	fi
+
+	# Multiply by number of ABIs :).
+	local abis=( $(multilib_get_enabled_abis) )
+	(( build_size *= ${#abis[@]} ))
+
+	local CHECKREQS_DISK_BUILD=${build_size}M
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	pkg_pretend
+
+	# need to check if the active compiler is ok
+
+	broken_gcc=( 3.2.2 3.2.3 3.3.2 4.1.1 )
+	broken_gcc_x86=( 3.4.0 3.4.2 )
+	broken_gcc_amd64=( 3.4.6 )
+
+	gcc_vers=$(gcc-fullversion)
+
+	if has "${gcc_vers}" "${broken_gcc[@]}"; then
+		elog "Your version of gcc is known to miscompile llvm."
+		elog "Check http://www.llvm.org/docs/GettingStarted.html for"
+		elog "possible solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if use abi_x86_32 && has "${gcc_vers}" "${broken_gcc_x86[@]}"; then
+		elog "Your version of gcc is known to miscompile llvm on x86"
+		elog "architectures.  Check"
+		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+
+	if use abi_x86_64 && has "${gcc_vers}" "${broken_gcc_amd64[@]}"; then
+		elog "Your version of gcc is known to miscompile llvm in amd64"
+		elog "architectures.  Check"
+		elog "http://www.llvm.org/docs/GettingStarted.html for possible"
+		elog "solutions."
+		die "Your currently active version of gcc is known to miscompile llvm"
+	fi
+}
+
+src_unpack() {
+	default
+
+	rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
+		|| die "symlinks removal failed"
+
+	if use clang; then
+		mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
+			|| die "clang source directory move failed"
+		mv "${WORKDIR}"/compiler-rt-3.4 "${S}"/projects/compiler-rt \
+			|| die "compiler-rt source directory move failed"
+		mv "${WORKDIR}"/clang-tools-extra-3.4 "${S}"/tools/clang/tools/extra \
+			|| die "clang-tools-extra source directory move failed"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
+	epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
+	# Hack cmake search path for Gentoo, bug #496480
+	epatch "${FILESDIR}"/${PN}-3.3-cmake-modulepath.patch
+	# Use built-in ConfigParser to avoid failures with configparser-3.2
+	# https://bugs.gentoo.org/show_bug.cgi?id=500856
+	epatch "${FILESDIR}"/${PN}-3.4-cmake-configparser.patch
+
+	if use clang; then
+		# Automatically select active system GCC's libraries, bugs #406163 and #417913
+		epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
+
+		epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
+	fi
+
+	if use prefix && use clang; then
+		sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+				-i 'projects/compiler-rt/make/platform/clang_linux.mk' || die
+	fi
+
+	local sub_files=(
+		Makefile.config.in
+		Makefile.rules
+		tools/llvm-config/llvm-config.cpp
+	)
+	use clang && sub_files+=(
+		tools/clang/lib/Driver/Tools.cpp
+		tools/clang/tools/scan-build/scan-build
+	)
+
+	# unfortunately ./configure won't listen to --mandir and the-like, so take
+	# care of this.
+	# note: we're setting the main libdir intentionally.
+	# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
+	einfo "Fixing install dirs"
+	sed -e "s,@libdir@,$(get_libdir),g" \
+		-e "s,@PF@,${PF},g" \
+		-e "s,@EPREFIX@,${EPREFIX},g" \
+		-i "${sub_files[@]}" \
+		|| die "install paths sed failed"
+
+	# User patches
+	epatch_user
+
+	python_setup
+}
+
+multilib_src_configure() {
+	# disable timestamps since they confuse ccache
+	local conf_flags=(
+		--disable-timestamps
+		--enable-keep-symbols
+		--enable-shared
+		--with-optimize-option=
+		$(use_enable !debug optimized)
+		$(use_enable debug assertions)
+		$(use_enable debug expensive-checks)
+		$(use_enable ncurses terminfo)
+		$(use_enable libffi)
+	)
+
+	if use clang; then
+		conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} )
+	fi
+	# well, it's used only by clang executable c-index-test
+	if multilib_is_native_abi && use clang && use xml; then
+		conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
+	else
+		conf_flags+=( ac_cv_prog_XML2CONFIG="" )
+	fi
+
+	local targets bindings
+	if use multitarget; then
+		targets='all'
+	else
+		targets='host,cpp'
+		use video_cards_radeon && targets+=',r600'
+	fi
+	conf_flags+=( --enable-targets=${targets} )
+
+	if multilib_is_native_abi; then
+		use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
+		# extra commas don't hurt
+		use ocaml && bindings+=',ocaml'
+	fi
+
+	[[ ${bindings} ]] || bindings='none'
+	conf_flags+=( --enable-bindings=${bindings} )
+
+	if use udis86; then
+		conf_flags+=( --with-udis86 )
+	fi
+
+	if use libffi; then
+		local CPPFLAGS=${CPPFLAGS}
+		append-cppflags "$(pkg-config --cflags libffi)"
+	fi
+
+	# llvm prefers clang over gcc, so we may need to force that
+	tc-export CC CXX
+
+	ECONF_SOURCE=${S} \
+	econf "${conf_flags[@]}"
+
+	multilib_is_native_abi && cmake_configure
+}
+
+cmake_configure() {
+	# sadly, cmake doesn't seem to have host autodetection
+	# but it's fairly easy to steal this from configured autotools
+	local targets=$(sed -n -e 's/^TARGETS_TO_BUILD=//p' Makefile.config || die)
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# just the stuff needed to get correct cmake modules
+		$(cmake-utils_use ncurses LLVM_ENABLE_TERMINFO)
+
+		-DLLVM_TARGETS_TO_BUILD="${targets// /;}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+	)
+
+	BUILD_DIR=${S%/}_cmake \
+	cmake-utils_src_configure
+}
+
+set_makeargs() {
+	MAKEARGS=(
+		VERBOSE=1
+		REQUIRES_RTTI=1
+		GENTOO_LIBDIR=$(get_libdir)
+	)
+
+	# for tests, we want it all! otherwise, we may use a little filtering...
+	# adding ONLY_TOOLS also disables unittest building...
+	if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
+		local tools=( llvm-config )
+		use clang && tools+=( clang )
+
+		if multilib_is_native_abi; then
+			tools+=(
+				opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
+				llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
+				llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
+				llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml
+				yaml2obj lto bugpoint
+			)
+
+			# the build system runs explicitly specified tools in parallel,
+			# so we need to split it into two runs
+			if [[ ${1} != -1 ]]; then
+				# those require lto
+				tools+=( llvm-lto )
+				use gold && tools+=( gold )
+
+				# those require clang :)
+				# we need to explicitly specify all its tools
+				# since we're passing BUILD_CLANG_ONLY
+				use clang && tools+=(
+					clang/tools/{clang-check,clang-format,extra}
+				)
+			fi
+		fi
+
+		MAKEARGS+=(
+			# filter tools + disable unittests implicitly
+			ONLY_TOOLS="${tools[*]}"
+
+			# this disables unittests & docs from clang
+			BUILD_CLANG_ONLY=YES
+		)
+	fi
+}
+
+multilib_src_compile() {
+	local MAKEARGS
+	set_makeargs -1
+	emake "${MAKEARGS[@]}"
+
+	if multilib_is_native_abi; then
+		set_makeargs
+		emake -C tools "${MAKEARGS[@]}"
+
+		if use doc; then
+			emake -C "${S}"/docs -f Makefile.sphinx man
+			use clang && emake -C "${S}"/tools/clang/docs/tools \
+				BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
+			emake -C "${S}"/docs -f Makefile.sphinx html
+		fi
+	fi
+
+	if use debug; then
+		pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
+		pax-mark m Debug+Asserts+Checks/bin/lli
+	else
+		pax-mark m Release/bin/llvm-rtdyld
+		pax-mark m Release/bin/lli
+	fi
+}
+
+multilib_src_test() {
+	local MAKEARGS
+	set_makeargs
+
+	# build the remaining tools & unittests
+	emake "${MAKEARGS[@]}"
+
+	pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
+	pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
+	pax-mark m unittests/Support/Release/SupportTests
+
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	emake "${MAKEARGS[@]}" check
+	use clang && emake "${MAKEARGS[@]}" -C tools/clang test
+}
+
+src_install() {
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/config.h
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	use clang && MULTILIB_WRAPPED_HEADERS+=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Remove unnecessary headers on FreeBSD, bug #417171
+	use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
+}
+
+multilib_src_install() {
+	local MAKEARGS
+	set_makeargs
+
+	local root=${D}/_${ABI}
+
+	emake "${MAKEARGS[@]}" DESTDIR="${root}" install
+	multibuild_merge_root "${root}" "${D}"
+
+	if ! multilib_is_native_abi; then
+		# Backwards compat, will be happily removed someday.
+		dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
+	else
+		# Install docs.
+		if use doc; then
+			doman "${S}"/docs/_build/man/*.1
+			use clang && doman "${T}"/clang.1
+			dohtml -r "${S}"/docs/_build/html/
+		else
+			if ! use clang; then
+				rm "${WORKDIR}"/${PN}-3.4-manpages/clang.1 || die
+			fi
+			doman "${WORKDIR}"/${PN}-3.4-manpages/*.1
+		fi
+
+		# Symlink the gold plugin.
+		if use gold; then
+			dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
+			dosym ../../../../$(get_libdir)/LLVMgold.so \
+				/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
+		fi
+
+		# install cmake modules
+		if use cmake; then
+			emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install
+		fi
+	fi
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	local lib= f= odylib= libpv=${PV}
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		eval $(grep PACKAGE_VERSION= configure)
+		[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
+		for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do
+			# libEnhancedDisassembly is Darwin10 only, so non-fatal
+			# + omit clang libs if not enabled
+			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+
+			ebegin "fixing install_name of $lib"
+			install_name_tool \
+				-id "${EPREFIX}"/usr/lib/${lib} \
+				"${ED}"/usr/lib/${lib}
+			eend $?
+		done
+		for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do
+			# omit clang libs if not enabled
+			[[ -f ${ED}/usr/lib/${lib} ]] || continue
+
+			odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib)
+			ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+			install_name_tool \
+				-change "${odylib}" \
+					"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
+				-change "@rpath/libclang.dylib" \
+					"${EPREFIX}"/usr/lib/libclang.dylib \
+				-change "${S}"/Release/lib/libclang.dylib \
+					"${EPREFIX}"/usr/lib/libclang.dylib \
+				"${f}"
+			eend $?
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/vim/vimfiles/syntax
+	doins utils/vim/*.vim
+
+	if use clang; then
+		cd tools/clang || die
+
+		if use static-analyzer ; then
+			dobin tools/scan-build/ccc-analyzer
+			dosym ccc-analyzer /usr/bin/c++-analyzer
+			dobin tools/scan-build/scan-build
+
+			insinto /usr/share/${PN}
+			doins tools/scan-build/scanview.css
+			doins tools/scan-build/sorttable.js
+		fi
+
+		python_inst() {
+			if use static-analyzer ; then
+				pushd tools/scan-view >/dev/null || die
+
+				python_doscript scan-view
+
+				touch __init__.py || die
+				python_moduleinto clang
+				python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
+
+				popd >/dev/null || die
+			fi
+
+			if use python ; then
+				pushd bindings/python/clang >/dev/null || die
+
+				python_moduleinto clang
+				python_domodule __init__.py cindex.py enumerations.py
+
+				popd >/dev/null || die
+			fi
+
+			# AddressSanitizer symbolizer (currently separate)
+			python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+		}
+		python_foreach_impl python_inst
+	fi
+}
diff --git a/sys-firmware/alsa-firmware/Manifest b/sys-firmware/alsa-firmware/Manifest
index b1e034d520d6..d3d5dc1555fc 100644
--- a/sys-firmware/alsa-firmware/Manifest
+++ b/sys-firmware/alsa-firmware/Manifest
@@ -1 +1,2 @@
 DIST alsa-firmware-1.0.27.tar.bz2 3935104 SHA256 34cde0e67fba1c86cbee5c219b91c0a245da01d268dfa7623b1a73430fd16e5b SHA512 4b1f722d75e7e74eb1eca767af491eca4a52807fad1d4fc28cbc1fce4c5a2a92b5e30a3b72d6ad01724902040be4176b8a786c6c55b617cf977f80f43477c6fb WHIRLPOOL d3af61b5256574c072179bb1b05b00b6fb81965456ec90c4b36386108f25017ee14066f24f10cd71bd01fb7d82786c8856c5be5777298b44529a9831912b743a
+DIST alsa-firmware-1.0.28.tar.bz2 3931211 SHA256 f9dc0be0cc8825a7f0302f307dd04f8732855bad60ee3ab00e795bd353c03779 SHA512 47b20b59e4d7d78c3315761d5cc0a1f090c286cd97dc42c84585b0e7c66a17d994aed7c82d2f095c83cd436e3276be87860f9d68a13a60c39bbdd97c47bf22c9 WHIRLPOOL 867af28966c2cca99e644733cebbdda6caede1ff21155ffd74b3eb0c60971f14c26b55d0fdc243c3b7d6379e813c0d1b2919a926d4f78e8bd6495a88404c066a
diff --git a/sys-firmware/alsa-firmware/alsa-firmware-1.0.28.ebuild b/sys-firmware/alsa-firmware/alsa-firmware-1.0.28.ebuild
new file mode 100644
index 000000000000..db06cb9f1117
--- /dev/null
+++ b/sys-firmware/alsa-firmware/alsa-firmware-1.0.28.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/alsa-firmware/alsa-firmware-1.0.28.ebuild,v 1.1 2014/06/23 22:12:31 ssuominen Exp $
+
+EAPI=5
+inherit udev
+
+DESCRIPTION="Advanced Linux Sound Architecture firmware"
+HOMEPAGE="http://www.alsa-project.org/"
+SRC_URI="mirror://alsaproject/firmware/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ECHOAUDIO_CARDS="alsa_cards_darla20 alsa_cards_gina20 alsa_cards_layla20
+alsa_cards_darla24 alsa_cards_gina24 alsa_cards_layla24 alsa_cards_mona
+alsa_cards_mia alsa_cards_indigo alsa_cards_indigoio alsa_cards_echo3g"
+
+EMU_CARDS="alsa_cards_emu1212 alsa_cards_emu1616 alsa_cards_emu1820
+alsa_cards_emu10k1"
+
+IUSE="alsa_cards_cs46xx alsa_cards_pcxhr alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_hdsp
+alsa_cards_hdspm alsa_cards_mixart alsa_cards_asihpi alsa_cards_sb16
+alsa_cards_korg1212 alsa_cards_maestro3 alsa_cards_ymfpci alsa_cards_wavefront
+alsa_cards_msnd-pinnacle alsa_cards_aica alsa_cards_ca0132 ${ECHOAUDIO_CARDS}
+${EMU_CARDS}"
+
+RDEPEND="alsa_cards_usb-usx2y? ( sys-apps/fxload )
+	alsa_cards_hdsp? ( media-sound/alsa-tools )
+	alsa_cards_hdspm? ( media-sound/alsa-tools )"
+
+DOCS="README"
+
+src_configure() {
+	econf --with-hotplug-dir=/lib/firmware
+}
+
+src_install() {
+	default
+
+	use alsa_cards_pcxhr || rm -rf "${ED}"/usr/share/alsa/firmware/pcxhrloader "${ED}"/lib/firmware/pcxhr
+	use alsa_cards_vx222 || rm -rf "${ED}"/usr/share/alsa/firmware/vxloader "${ED}"/lib/firmware/vx
+	use alsa_cards_usb-usx2y || rm -rf "${ED}"/usr/share/alsa/firmware/usx2yloader "${ED}"/lib/firmware/vx
+	use alsa_cards_mixart || rm -rf "${ED}"/usr/share/alsa/firmware/mixartloader "${ED}"/lib/firmware/mixart
+	use alsa_cards_hdsp || use alsa_cards_hdspm || rm -rf "${ED}"/usr/share/alsa/firmware/hdsploader
+	use alsa_cards_asihpi || rm -rf "${ED}"/lib/firmware/asihpi
+	use alsa_cards_sb16 || rm -rf "${ED}"/lib/firmware/sb16
+	use alsa_cards_korg1212 || rm -rf "${ED}"/lib/firmware/korg
+	use alsa_cards_maestro3 || rm -rf "${ED}"/lib/firmware/ess
+	use alsa_cards_ymfpci || rm -rf "${ED}"/lib/firmware/yamaha
+	use alsa_cards_wavefront || rm -rf "${ED}"/lib/firmware/wavefront
+	use alsa_cards_msnd-pinnacle || rm -rf "${ED}"/lib/firmware/turtlebeach
+	use alsa_cards_aica || rm -rf "${ED}"/lib/firmware/aica_firmware.bin
+	use alsa_cards_ca0132 || rm -rf "${ED}"/lib/firmware/c{tefx,tspeq}.bin
+	use alsa_cards_cs46xx || rm -rf "${ED}"/lib/firmware/cs46xx
+
+	local ea="no"
+	for card in ${ECHOAUDIO_CARDS}; do
+		use ${card} && ea="yes" && break
+	done
+
+	local emu="no"
+	for card in ${EMU_CARDS}; do
+		use ${card} && emu="yes" && break
+	done
+
+	[[ ${ea} == "no" ]] && rm -rf "${ED}"/lib/firmware/ea
+	[[ ${emu} == "no" ]] && rm -rf "${ED}"/lib/firmware/emu
+
+	use alsa_cards_usb-usx2y && udev_dorules "${FILESDIR}"/52-usx2yaudio.rules
+}
diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
index 022a9929c33b..9be067c490b3 100644
--- a/sys-fs/dd-rescue/metadata.xml
+++ b/sys-fs/dd-rescue/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='sse4_2'>Use the SSE4.1 instruction set</flag>
+ <flag name='sse4_2'>Use the SSE4.2 instruction set</flag>
 </use>
 </pkgmetadata>
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 17ab93689d96..dab6ba9a17e3 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -7,6 +7,7 @@ DIST genkernel-3.4.48.tar.bz2 274876 SHA256 ac35531074765afdab6d1762f9facaf8b0d7
 DIST genkernel-3.4.49.1.tar.bz2 266425 SHA256 84f23a7d01aafa3de0ec651c266db1a6d25356cf7257db3ea1b019f552d0406a SHA512 2ad73f845cfb490679be7245a367cb9dedc032a7b9e757f25fffab9aee5638cfaa586d3fd3100ebbca6899da3277b0d75d66a59b1a1ce59816f41b85102e0b2e WHIRLPOOL 99d24ab187afeb66b68a6de81685f335f1d652c5fbe321f1178abdd9cb768a05015b8fe5da9fb6746aa0a97a293ae34bb76590a9be646cc312abf7d527d8bf3b
 DIST genkernel-3.4.49.2.tar.bz2 266427 SHA256 62ade4f83cefc2278e1dc7cf1456974b037a2aedc6dafcaf05c02b53e29a6e34 SHA512 f66b0107438d420a16de546ee28e2a2f09281fcf21c2ffc26c94438ba4c7467e607bf296081954e90d01a92e7db7642091267bade458b837758041a64b0b97ea WHIRLPOOL 626adac32a9b4c9f1ab9acc62a2354d894db806171a4fe28bd4697e28b7315d2ac1da1fcc438fbdb8ce5d9ce9bb88269c4e4f549122bae425b8d98e7f32315fa
 DIST genkernel-3.4.49.tar.bz2 289872 SHA256 7212b1c80e63db9949f2a72f160b06ece6d886980aee5c165050e92b400bcd49 SHA512 4116656544d8bb30f79a86366dae58f8c52942ce831b4e3d263b103dfb76afb92d22bc44038212c53285b0ab5803d7931a4a5e9595b275f0f254c22249eddff4 WHIRLPOOL 27c7db14abe33fc5546c95681d7e14ed9d364457e2df0bf3f6d98bf9afcc3e0fdfc743ac0b645b2421aefe950ff4b6b30d4a6eab3b15a787e3b0faca100a5bd5
+DIST genkernel-3.4.50.tar.bz2 273874 SHA256 d1450b9a38837147f3ec2600bcd05a56df5537a1d9de0c41db123833a5f2f450 SHA512 8b56c0736abaffa1c04dd1315d38ed35be46b72a2e20b5602e946dbabde9c05a66691d3059306f58a17f436124912dd0b39ccc012fff8562b1531cfcb90e7d28 WHIRLPOOL 09d88f2013267021e792b784850057472b40d216b45c8cd8f67c9340c30ee4cdf8161beaa7fd628fb71755a35fed6e64adddd9b957f5c5b7698207fb70d4a7e4
 DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
 DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
 DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
diff --git a/sys-kernel/genkernel/genkernel-3.4.50.ebuild b/sys-kernel/genkernel/genkernel-3.4.50.ebuild
new file mode 100644
index 000000000000..164c7d21048d
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.50.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild,v 1.1 2014/06/23 23:56:51 robbat2 Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="3"
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		cryptsetup? ( sys-fs/cryptsetup )
+		app-arch/cpio
+		>=app-misc/pax-utils-0.2.1
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/* || die "doins"
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	GKDISTDIR=/usr/share/genkernel/distfiles/
+	elog "Copying files to ${GKDISTDIR}..."
+	insinto $GKDISTDIR
+	doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
+	doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
+	doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
+	doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
+	doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
+	doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+	doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
+	doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
+	ewarn "even reiser3."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+	if use crypt && ! use cryptsetup ; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
diff --git a/sys-kernel/genkernel/genkernel-9999-r1.ebuild b/sys-kernel/genkernel/genkernel-9999-r1.ebuild
new file mode 100644
index 000000000000..3a09131db1cc
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-9999-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild,v 1.1 2014/06/23 23:56:51 robbat2 Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI=4 # works with EAPI5 without changes, but this is more supported for a crucial package
+
+VERSION_BUSYBOX='1.20.2'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion-r1 eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion-r1 eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="cryptsetup ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+	cryptsetup? ( sys-fs/cryptsetup )
+	app-arch/cpio
+	>=app-misc/pax-utils-0.2.1
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+pkg_pretend() {
+	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
+		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
+		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
+		ewarn "to have genkernel create an initramfs with LUKS support."
+		ewarn "Sorry for the inconvenience."
+		echo
+	fi
+}
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+	if use selinux ; then
+		sed -i 's/###//g' "${S}"/gen_compile.sh || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+
+	epatch_user
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf || die
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	cd "${DISTDIR}"
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.bz2/}
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index e0a0e8279487..c45e61e05eee 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.51 2014/06/21 15:32:58 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.52 2014/06/23 23:56:51 robbat2 Exp $
 
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
@@ -123,18 +123,17 @@ src_install() {
 		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
 
 	# Copy files to /var/cache/genkernel/src
-	elog "Copying files to /var/cache/genkernel/src..."
-	mkdir -p "${D}"/var/cache/genkernel/src
-	cp -f \
-		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
-		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
-		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
-		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
-		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
-		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
-		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
-		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+	GKDISTDIR=/usr/share/genkernel/distfiles/
+	elog "Copying files to ${GKDISTDIR}..."
+	insinto $GKDISTDIR
+	doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
+	doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
+	doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
+	doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
+	doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
+	doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+	doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
+	doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
 
 	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
 	insinto /etc
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 8e6477a40949..c95cef25a861 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,14 +1,17 @@
 DIST deblob-3.13 122060 SHA256 8fc8f5242cd58f8560d1caecdc6ab786d6470660280f910a8b70bc47fae5eabb SHA512 90c329c7b2e49ca8e51b3ccd5ede999f01a70ce1b227f958f34306d32414787192d51481a22ae831c30179e2ef83bdf4eb5c356b49864ab8d7b5a9ed6baed294 WHIRLPOOL 56a7dc599ece173ace43a633ddf2d1fc4876b392e8cd31dfe840a6109eebed18a8a9c33c7e191ea9cf0b605818a59312c76787c77aa479b6c84feb23083c0fb4
 DIST deblob-3.14 121249 SHA256 980400e0db952ccdb5a507f99444330af893ed0f8a7a052916fcf0c2b2631f7e SHA512 2cbdf4f3947c12ade0931f0b3fb8b9c0312626a3bfea9d1c7d8d1d875b4673624ed3a6369653521998bbea0cde6730b573d6be918d052f1b553e093cb42a838f WHIRLPOOL 7ba1738ac829d8848104843da6237576f235c0151d53944ff3a7e0308cfb91600ffb9253402a34c2ed106c5b0bb3ce36785ead990396465341a957c58319221c
+DIST deblob-3.15 120796 SHA256 d24f4b0548f42e7e83695919008cb75c70f5a7cb9c8a10824ca3c5c51fa62eaf SHA512 7815575001e48569268e60248da2768c6ee81982761420068ce16e6282a9552783595712ae4d937bb62d7e5f33e62b5daab0da35c8bb49c5d94ebde42f030495 WHIRLPOOL 403de2590101bc30408750a7a4eb1bdd6effbc5e2cc5c0615feff34abea649d015e02c4e54ddbb3dc33864c160f516a5e1e526162bdd0176944b382e9a52f425
 DIST deblob-3.2 107602 SHA256 5db88405af6d51a77d84354afc3b2bdf673b1a5dcff37bb8db4ccbd12d91db20 SHA512 f34b7128adf716c908cbbbfefe72149fcd88b727d27edab43be65d4e6a55112b6d937d5c2bed86454d58781f3766ba4cc6db668cb6174a6039d276499da37cb4 WHIRLPOOL 0922457f7ca413c9d8115182964a7c051560799c4724452f81cb4c0383cf62c45b0364d6e639bd9d2b9000411d8773cabd2e8af99e8b0dc7f7bdc886db432d6d
 DIST deblob-check-3.13 612002 SHA256 55a9264ad886259c9b20f1365245a993482a0f593d01e1824eddb748bc57e271 SHA512 64d93694acc9dd1046e967b0d0f285068cc248815a3c84c58aa4cb3b6bbc3fdcda4bce3b119b44f522a9cb6cfc10a0992cb5d19f880c7d6055c5c0ed3201905c WHIRLPOOL 1b196a945f5f07c78eff5e8742472b0d8ff570c7e11e2cd3d4d954f8fbd260b27b2779f2d794a30992e4d492b873d5f73163501a0c04372e0167e98640d587c5
 DIST deblob-check-3.14 613747 SHA256 e1d5ced14e38fd415eb5a9a50e180cfdc63b2d0f0350a6d36645b82ef0351304 SHA512 f5901a7c41db34ea3c29e6c6f6fa1afacf4edca1cfad901599b982fd66b5ce3894aa9075b5d15b7a8a6c9694833752fb609d98889b5de39ab59aea7d024a740b WHIRLPOOL 5064bf7423a4703a976b4342da5b3cef65584ee701462e261398170b3e5189036327e114deb15a29ded79541dbe084fa86b08b8c293d4585614ac09f791d7f60
+DIST deblob-check-3.15 614485 SHA256 a594a31b5c0a7bc544d2c5158a16d4565de4e45b14f3fc309cfcf91bf46491e2 SHA512 f85e0d9ebf25b37fd9ae765cb2d5767ac475abc72d8b6bb5ed775f03efb216d53cfe1d86bd2945642274cd2c3ddd6ee0ded05019bde7bac71733c96b366cabb7 WHIRLPOOL 8e8e6cdd41313f61a7f9aa4630185f06e785ad951582165d0890596a3e59f8c703a658bf75a36359750eddb9a8b3edb86656860a88dc47b722329aff4cdbb7ef
 DIST deblob-check-3.2 423268 SHA256 9e67dd0885aa8ef356dbc15d487c8dea5a54f74c5b03a5d7946b65ee43f12638 SHA512 3abb9968ef4750fda90e4e2283981fd4691b7f9854244413b31d17bb60382a6d809fec929d8d3f9b52397dd9f9fa26783f4c3a25f3f4115b76ed585ea68e9916 WHIRLPOOL 891c3f809af470d680ae896c843c09612fb5124f2805e03d67b28ec4353bff0bc346ae9f680d900f0f63e681be86a0195f9baab7dcf3b5accfda739b106766fa
 DIST genpatches-3.13-13.base.tar.xz 284344 SHA256 b74916bf239655bb9fc368e10a3d9d62e6afe8878a9c5dc5f65f712823e80ba0 SHA512 861272348cd8743b6575826e34a01d8bc89cfb5249b24213bb49a0487490a3d240a215534e5b31142ccd98eed8c6c148d1a1b668bff2f070fa449f393346a8fa WHIRLPOOL f72bff2fb3caafe41aab882f17aeb7625c4b9920c5b01cf3a48946fdd20888ae9fe247dcc466cb8b6d7618f3db81a2efa783621bc85c8303cc363b32e154a3f0
 DIST genpatches-3.13-9.base.tar.xz 193284 SHA256 f507ccb65f1c2cbeee86e4e5949f62db924f5cd9cd35b3962e478802c2279995 SHA512 49540e2c4aae2641a14c27c88888a52358298711d682865ae39128f1d5935325c0bf901cb58ad8d5477940efaee87e5bbd4d758ff4daca88fc23765d8ee176a3 WHIRLPOOL d30fe74184a549493da4fd2ee1b0bd7d75e5439c8387d7d81bc9319926be8706db3e177d5e91b073c988c49a7ff2d2be63854a1e7b43472675844c512daddbc7
 DIST genpatches-3.14-10.base.tar.xz 223420 SHA256 c448e67d86f230b20c251cc5780c0ab76cd0c89eb97af9f21e58de45aee8e846 SHA512 addfd00e6418965389f241c3f73ca7b5efbd99ad07afc6b37704182e70d27c9f359f5bb1131d93464c064e8b0961566cff078736e7ed2ae07a05db96cac757fb WHIRLPOOL ca4b3aed9a3a89188ec944488f68dd6f859baf3b96b1186a39c082f07eafb58dc5e3bd8402751277c95ba04e6e5c86f57560a54e5b5a747f2a3c9862c728ff94
 DIST genpatches-3.14-12.base.tar.xz 247500 SHA256 ca91565cfc3614255957686e961e75c8acbf2f7b35b2447b0e483bcc82f8a8b6 SHA512 2ced30852f33d07508aee784a98e05e0a85e8b56e822f6505ac95ff245dbb8b4fd0eefa91caf01befd7de2347cd775046be73125fd3df2ba3549b06bb7d70a84 WHIRLPOOL 285b40b36d1a30c5b92ffe59b03c68edc4fc2f44d723bec475fe6c7967fc3d00a4f9316f48048db3f0b3948092b751c9e1485d394488f8665d06f97702e17006
 DIST genpatches-3.14-8.base.tar.xz 150768 SHA256 bfc60e9af49bc0a8b9ddb6ef38050ec8d06539f83302063ac5d19c8ec606760d SHA512 1688742ff91a54500b05ebffdb15730623e7f7850f16ce56698e9cfc3bc1309c058d2d5d5c3590bd296345c300de2a1c43ab1ee2f1dd9c03d2f6d11784cbb495 WHIRLPOOL b97b90bbd08500d0977839a35cc722d27c0cbdb50ebd74f55ed652b37c9759d5409e4e50d2006eaef8f49fea39a2bdf442185bc3d6374192e9da8121f0a8227c
+DIST genpatches-3.15-3.base.tar.xz 10916 SHA256 ea3e83f7b429137c8f131d11b541d7d48e651a6c05ffe489ebe08f2d225c7f6d SHA512 f44b531275cd91211ab99537aeb32bcf6ee17768be2b7c44b8d9c97452a50b4c40a58b8124467f67814d5d20050c5a644cad6a8a1d30835b879d662054b870ee WHIRLPOOL 61a0b17f4ddcb7c573552425b7135c45b7e4de2b2df351fd0767b4cb84f3b0dd0fb6217327b0b056502bb324153baf3cefd7d0503085ec1dc54e5951e50febe6
 DIST genpatches-3.2-16.base.tar.xz 410332 SHA256 d3ad97b119c5b8cfd8e34f1cf118dc7d5bbe61fe908a5627f8ab6365517d7190 SHA512 6c917efbdd26dada3e68241c4d55833968e8ee7044ea7fa2edeffdd4d7eb0edac157057abb75da09ac6d2b5368d228ecd1c2ac6006a9d45b91dbb264eae33625 WHIRLPOOL 155a5b3297ec53a6bdb76e20c8c89d4f4c35ed2bb47e20281ce305bf9edd413e4d89168e250a699ace0561c151ef2f484c05e59013dbd971d43184c5f072a71a
 DIST genpatches-3.2-16.extras.tar.xz 16764 SHA256 c3f5adba6f1700c716354b91bc624115c6f5cae6f8fbdc51d07a76d4546bacaa SHA512 e3245c05f3385bb27852c00a39a898c91b3c0006e19c5db561f3e41f9bef7e97012ed29ddf9b0e2bd1ba1fa16590e516fb00ce754a84dd5c653c046b9f4e63f9 WHIRLPOOL 3c1ee6db88607ed91366067217d4a556fb5516ce8bee2859e97be7e214a05609e2d36ec27ec413154baa432a984f53cf69cfb94ae65ec4b8d2e9a86641d77a0b
 DIST hardened-patches-3.13.10-1.extras.tar.bz2 806948 SHA256 a3eb7bb199370da6139d70489b009e93b2539cd31bf4540d0d4c60f72925020f SHA512 991c190540981bcf34c62ae27ed241ceb41848d479b332c9b1de83b498b86df9bf0d264a6b6e0c252c3460ae3446baf3a92d635027aae5440126be0cfa5c2915 WHIRLPOOL c03fe49f18bf9c735fdb616619c7892d3dfd868f59d2032d58f549b85dce0dcb418a8b0b3fd3fb283ca9a7c348efe2a4d5fcef9cd04b26305dbe185dc4c2e21b
@@ -17,12 +20,16 @@ DIST hardened-patches-3.14.5-4.extras.tar.bz2 821438 SHA256 75ded742278c10071353
 DIST hardened-patches-3.14.6-1.extras.tar.bz2 819882 SHA256 7f9d4685dc3ff37fe8dc5ea61c5f8a94875a8c6bab119decea3d5301191b4817 SHA512 fb5d0e8ea17de138d1dfe6c498f687df2325206cce598fc6401f786376b0fb7f8fd63f4fd24662f904703196f907abd09dcfaa73dc58064ca6553e550ac5ab51 WHIRLPOOL 996c8f8e55eec89b74216049fc98e9044fcf65d886fa5d10de999d22cd2eb4a9b16c567fc278a8000a82468c8d35860274cd29bcc82b9cbf275e7978c6cffd05
 DIST hardened-patches-3.14.8-1.extras.tar.bz2 821027 SHA256 adce350fbd7f130d2bd94320952bcce1d672bb2b2da5c4c2fd25e38a0cf0ac20 SHA512 97a727ab4864bd84a1e89d8466f9e17b7f08d5eeedd28a5e5b40d76a86c4fd609e2782b6252d2a7abe4d7287381537f4bde7e929cffb6166640480454bfb40f2 WHIRLPOOL e7695aa39ed857bf5e0e61deaf413444c0549274be9fab26fbcaba9af57374cebf4183cfcf47803792529d8df9b27a5ace6af2cb6d787c14e6f3c0c1cf03a777
 DIST hardened-patches-3.14.8-2.extras.tar.bz2 821548 SHA256 7567551fe886965f87cc3a7f7f974d0417bea9c445f9beb4302ed9244fe16943 SHA512 7ae6a78f9187bc6d73aec2b49e132331004b4ee30a6ae17079082edb66499720ec513e39dcf217cfdaafb3b80d3757bb1bde20db0468f138744b24be4d63a645 WHIRLPOOL 2e50d897d19d52924e2d5d583890538cbdcfee0437a687d4676867c34b911f023c81996a1ac9834c73bff01a116c550c5e4dbd05dce3fa790e2a735e96337493
+DIST hardened-patches-3.14.8-3.extras.tar.bz2 821300 SHA256 5f315710c5ae171da6e8cd47ad989fb8f15613c7c96a30e309c3a1b4aad9da1e SHA512 c688e727bacd89e85f3a3ddb6e3637468dd8a92e840c9f5f890125704623f12380d6206a7e1be08a78df35f79e844fdee67e70287d1802f54c5576961d5fc660 WHIRLPOOL 7806a2ac6c340fa103e6642eaab963653784160725196ae94eef725d29477a1f3ea96fb59e1178e7c6c17f7e098804e7bd3d893a05a8aa79b74fa1e1f5245f7b
+DIST hardened-patches-3.15.1-1.extras.tar.bz2 852725 SHA256 022fb13a9d1bd8a7f978f9ae08eaf13a41000497e39bff8f136cf01bc5e8853b SHA512 907917bec47a5a72e593604b147b45d0dcec50f6b1d2a64188d7eb10d000a753f67e5c34d347fdb5738db5fa6732d3e02da4294427e82b1d83ffac52d4da4422 WHIRLPOOL 663abaae6a5686e6940e15a9fd7a5261a4d5a7e2b6908fdbca0d9bae53b3f3e539f8a45cce16b6a807c3511df29def9d8291c41d5725491567d9f595e0b4be21
 DIST hardened-patches-3.2.54-10.extras.tar.bz2 1766757 SHA256 362ae7cccee1ad85ac0d134a4e04aa6889372a075e7c5797b2dba5d9bf99ca0b SHA512 0d2c3ad87a4e006de1a8c8b497d88b6fc47c9a24a5e4de930ef8f1ee4f1a3acc9eaac1f63cdbcdf17d71d72bcd8bafb30e60adebfff407a237c7b3622e4841ec WHIRLPOOL ca6efb0876bfda9ef8660a877d8a1c2cf05c01ee7f93fede83bf00b545b8caf018e1a49b623ecfe4b8fa0d549d31ffc4aa6270dadb10f423dcefd119943ed436
 DIST hardened-patches-3.2.55-8.extras.tar.bz2 1798078 SHA256 d7ddc2b8984aa6cd57c5b188fefe60acae2f90ec3a6badbcda899bacd04dc0c2 SHA512 fbdae9dffc1d035a73fa7672734304b06d94e22407f37d9960b549cb6ce864546afb2a50a3f6da36b58eef2eb611d64ccd8e87ff0bb5e5118ecfe6171464331f WHIRLPOOL a1afae9d5b533c6a3c6d3ba2d72c344f17464e2077231f42aa3b2514412df0d6ba98227431fb0d7aa42e2c9e95e34550a74920c590b44a7188dd41ae67c1458d
 DIST hardened-patches-3.2.59-7.extras.tar.bz2 1906081 SHA256 dd3631c2bc027d689aeb7846f5e1430e51a9829f4dfc5c6d77ff2f1ec389aa3f SHA512 a09d1ff7eecac76f17a823b45ded69618fd354a3425472fe2dfb546028a6b7f537fd6e55063b62e51cfce97a334d0f51067c76fd8d6526ddffae711ee988b113 WHIRLPOOL 1b502546ce349a75b0916d41539a56607765985649809328fc396ebbb110e16c7f87379c0aae45a7962d2da4acf5b438b1c71151f3df4fc7872242d4a3dbcbbd
 DIST hardened-patches-3.2.60-1.extras.tar.bz2 1928816 SHA256 5ee94389a5d3064b9db4daadb5d0c79d1eaf84ac336288cafc6f14258463d4cd SHA512 959f0819f98b89db8ecf39fb9e80ab1256f4639f4d32341ac0ceb8af12f1da3133329274c4ec92279839e8aaf2397ffa5915eaf98635cd51a493f906463daa11 WHIRLPOOL 14f22b9e02371772c328341ace6f70e232bb4a60f1c7eaedb9bae2304b8d1b956325b5a95a441b660590b78ea7617fe211827fac6717b866ae4c7b6637feeec3
 DIST hardened-patches-3.2.60-2.extras.tar.bz2 1924214 SHA256 8d5d13bc16a879a32cb106ab581dfbc64f73c74ce0819a63465175dbcad6e7fa SHA512 05ba97f27ea47d5b451fd72abe6aefe1fe576e0aa992e4c9dd0b2c0b09da93b4447e3277139a038ac650781fdd8222f2a628d04043bf7f359f875146eb6fff1d WHIRLPOOL 8f990bf8ae913cfab3dc59ec62b1b2591d92e4f2e7c7fe2f41f34b94326c4de730a38febd0bb31c88f2bd5267e39e9e67e31678331ad68491405fa26cc73fb41
 DIST hardened-patches-3.2.60-3.extras.tar.bz2 1930755 SHA256 bff3abb8d5265fba3bb2bb669db7bfa4c9b2f121dbaca9c0a7c4c81df700f5aa SHA512 65364a30bcdbd7a3bb8199b997067eee7d86fc58d40cf95008f339b73400c8ca14e20675d79bc8fa67dabc56c88cd880ac9c1f8d6a9b878c55b6215d2e40dee7 WHIRLPOOL 6aca9168b5d3ad503f26bb15716256e968e280f419428e689ff27db4b2462635b8373be35648e4311aea6808647f9722d3ccc1e814c0381af3125486d5f13fdf
+DIST hardened-patches-3.2.60-4.extras.tar.bz2 1924167 SHA256 f769ece6da36e334534c4e24d8b895629d6dea17308f2cf5a8c647b8cb4e3f22 SHA512 2b9cbc1f1f1597f7b8c3d93475039244a36ea5dc2c01413f98e350c1b635525d692bbd90d34382da54987e94d54cad1fb310e2e5f58abd2c2cd7e05f269a9cfa WHIRLPOOL a1668bc4fecc749fd895b3807f3de8eb6827c55d97d50a5215a9fbf9971023c09ac58f2f2c05aeb728d9132b1f190a3c4a20f6d28caf5634a8cfc2def0f6e1ed
 DIST linux-3.13.tar.xz 77187032 SHA256 4d5e5eee5f276424c32e9591f1b6c971baedc7b49f28ce03d1f48b1e5d6226a2 SHA512 1ba223bb4b885d691a67196d86a8aaf7b4a1c351bf2a762f50f1b0c32da00dd0c28895872a66b49e8d244498d996876609268e64861d28ac4048886ef9f79b87 WHIRLPOOL 2992257a17e85b3eb16fcaf21678fa6dbf31f80c2099fd1ad0ff9852ac1d16122ac8e2c0b46421d8895d4368253a724e439cd625307ee7af7bd1e50cb2c9b62a
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
+DIST linux-3.15.tar.xz 79676484 SHA256 c3927e87be4040fa8aca1b58663dc0776aaf00485604ff88a623be2f3fb07794 SHA512 d5dc477cad4584e56e2e2ef9e0950c2b22e76e5cf5090a896ba099cb7c5e5db1853a4aeb96b199189653dc66d461557e95198e37516a619f7ddc01ba6b308e02 WHIRLPOOL 7f3dfde1a23aab75b7f40770ae2ca77c1b28f845e4abe6296b2aec9b56fe94f7afa76b00eb6cc7475305c31b726ebeb4643107dd48c12ac04c933cf1856b8e77
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.8-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.8-r2.ebuild
new file mode 100644
index 000000000000..d0ece84e10b5
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.8-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.8-r2.ebuild,v 1.1 2014/06/23 23:44:39 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="12"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.15.1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.15.1.ebuild
new file mode 100644
index 000000000000..28f016b7c76d
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.15.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.15.1.ebuild,v 1.1 2014/06/23 23:46:49 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+	1500_XATTR_USER_PREFIX.patch
+	2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.60-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.60-r3.ebuild
new file mode 100644
index 000000000000..dc20ffd6f462
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.60-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.60-r3.ebuild,v 1.1 2014/06/23 23:43:02 blueness Exp $
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="16"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-3.0*"
+
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}"
+	ewarn
+}
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 1e973a2eeffd..00f80071ac0f 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,2 +1,2 @@
-DIST google-chrome-unstable_37.0.2054.3-1_amd64.deb 49289328 SHA256 a9b9eb93e61c44a19f1ddedc859ec421d2825001dd75a28ce226d90de6597f9e SHA512 59698d2d06ed38ec3d5700d2a89b4ada21ce33dce7be25245e76e601b3f751386bc74bef6e0b69c3b427a12278d79a1d371875a0bf10a69c5a553e6552f58e38 WHIRLPOOL 745f808290c2c14ba8d32317c81b12821a64533ba0eac56297134194b5d50149060d6fd583592df6968e108321a382414d919ecf9bc5972de17cda66534b10fd
-DIST google-chrome-unstable_37.0.2054.3-1_i386.deb 49554200 SHA256 fa91e713ce0f05909973439c4d497a76bd50e9ef39fa38b8ae73eafffef58208 SHA512 16fc66d5ea27f8620e989bcd66867ed93e7882b864795c7c2ceaddd1be8946822c1581b07faa54d8e4eb63df688273ad67726a25e310d952b55358ea987d5e77 WHIRLPOOL ae7c57c969523a84e93d774e2a625958b72cb34a0ab6ae1fce75bc1226e566a90b1c679b8d6b0060dc5cf02836b8eb8145a2175e9816b62d7baa7ed3dc82fa41
+DIST google-chrome-unstable_37.0.2062.0-1_amd64.deb 49476212 SHA256 1b218159e355dff589814a583f67f0df8a125bf5a720b980e49ca2e31fb58979 SHA512 fb86c69fd9813212b3837cf6e546a8d818b4086afe121952ec2b1f04030fee9b9b85a5300a1f1ecbb97b2cec37a7ab3ced51807710c12001eedcda60daffb002 WHIRLPOOL 5ed867d07308fca195396a45cbe7abf9613597fa61f7f0c33c874f7c5984023661a9de37dce0fc92921595c5ec34164eef410ec908831e4995f2bbf53478b7a3
+DIST google-chrome-unstable_37.0.2062.0-1_i386.deb 49777610 SHA256 55dca6e9e591261ce2f5f2e9ab50ca0739ef0b02603907e0591eae1e65441ca4 SHA512 989db44321377da84194360790b27544a28901541fc80ef3a0601658c0c7e9366238baeea58f80a1907f62157f41dfc4a184ce2d8f65578a1dbc7cd08fe079ed WHIRLPOOL b81d59829fbf85dd6e364d011c664c0ce2fe7a9f5212f7af8d351b6041b27fb62b233c4ce19a6644f6bbd0d9022d8d44d670f50914db04acef395b74ded52556
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2054.3_p1.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.0_p1.ebuild
similarity index 97%
rename from www-client/google-chrome-unstable/google-chrome-unstable-37.0.2054.3_p1.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.0_p1.ebuild
index 328c1edba7c2..620cb209bd35 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2054.3_p1.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.0_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2054.3_p1.ebuild,v 1.1 2014/06/18 13:13:14 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-unstable/google-chrome-unstable-37.0.2062.0_p1.ebuild,v 1.1 2014/06/24 02:35:48 floppym Exp $
 
 EAPI="5"
 
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 29e2abeb054f..5c53740c85aa 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -2,5 +2,5 @@ DIST google-chrome-beta_36.0.1985.84-1_amd64.deb 48370076 SHA256 7988733136e8c72
 DIST google-chrome-beta_36.0.1985.84-1_i386.deb 48723526 SHA256 fe9b0f0dc654860f6fc0948c5a7929cfb9a8414bec2cb6c02dcdf0e8edfc5dca SHA512 0280453e3cba0eaad098392c0e7bb284c9e6d37e5485b9395f3432451f55d99c93a398f9e3ff33a4d56598e22fd2d45e776552d04db307021b42b2e85556f547 WHIRLPOOL 56640b5d8be9af1cb5115a8048fd5e2b6e7b97bf7b73abc0555c8c1e6ff2ddeae3117208e2ec19bbf2c45ff3530b07e8d97326d32cffb58875d04459c02cd34b
 DIST google-chrome-stable_35.0.1916.153-1_amd64.deb 46537134 SHA256 2e723d825a3b4563232a1edfdfd4309bb23174b54a90650a4aa6a18d62a84cf4 SHA512 30dceb1ecaab00cf3743fcc192f561a024205786090c18e88cb840fa5a39b7dbdf578e2a436fd7cee047e84f7560ec9df5ec49fd920388d17d667ecca1861f23 WHIRLPOOL fa3cbe91ad229675260c799e4fc738f2cfb83be2eadb8902b2ca12865dee55a15eb2fb8bfd2745b8e00186acac239c0cedb6c3584e2af5d517638ae7041a8656
 DIST google-chrome-stable_35.0.1916.153-1_i386.deb 46806400 SHA256 767a8dce8e06f74d5a1d42f9fd780647d31f0984ba153c97d11645d57827a376 SHA512 9b95bcb5e076f369127c8201f994d1357f9945417b4795121654bb992721267d02de10b4e3b87dfae8903145ac2cd2d6605aa7ff2ebefc2efcb55c3799d7ea65 WHIRLPOOL 6c707a7f537ea31e38408389b5cbc3f6e8571e17d7a1d794a2d12dde19a02dc2ff3710f770ee8f62c90c7fbeea6b965f773b706a68f8ea97f0bc14fc487e9590
-DIST google-chrome-unstable_37.0.2054.3-1_amd64.deb 49289328 SHA256 a9b9eb93e61c44a19f1ddedc859ec421d2825001dd75a28ce226d90de6597f9e SHA512 59698d2d06ed38ec3d5700d2a89b4ada21ce33dce7be25245e76e601b3f751386bc74bef6e0b69c3b427a12278d79a1d371875a0bf10a69c5a553e6552f58e38 WHIRLPOOL 745f808290c2c14ba8d32317c81b12821a64533ba0eac56297134194b5d50149060d6fd583592df6968e108321a382414d919ecf9bc5972de17cda66534b10fd
-DIST google-chrome-unstable_37.0.2054.3-1_i386.deb 49554200 SHA256 fa91e713ce0f05909973439c4d497a76bd50e9ef39fa38b8ae73eafffef58208 SHA512 16fc66d5ea27f8620e989bcd66867ed93e7882b864795c7c2ceaddd1be8946822c1581b07faa54d8e4eb63df688273ad67726a25e310d952b55358ea987d5e77 WHIRLPOOL ae7c57c969523a84e93d774e2a625958b72cb34a0ab6ae1fce75bc1226e566a90b1c679b8d6b0060dc5cf02836b8eb8145a2175e9816b62d7baa7ed3dc82fa41
+DIST google-chrome-unstable_37.0.2062.0-1_amd64.deb 49476212 SHA256 1b218159e355dff589814a583f67f0df8a125bf5a720b980e49ca2e31fb58979 SHA512 fb86c69fd9813212b3837cf6e546a8d818b4086afe121952ec2b1f04030fee9b9b85a5300a1f1ecbb97b2cec37a7ab3ced51807710c12001eedcda60daffb002 WHIRLPOOL 5ed867d07308fca195396a45cbe7abf9613597fa61f7f0c33c874f7c5984023661a9de37dce0fc92921595c5ec34164eef410ec908831e4995f2bbf53478b7a3
+DIST google-chrome-unstable_37.0.2062.0-1_i386.deb 49777610 SHA256 55dca6e9e591261ce2f5f2e9ab50ca0739ef0b02603907e0591eae1e65441ca4 SHA512 989db44321377da84194360790b27544a28901541fc80ef3a0601658c0c7e9366238baeea58f80a1907f62157f41dfc4a184ce2d8f65578a1dbc7cd08fe079ed WHIRLPOOL b81d59829fbf85dd6e364d011c664c0ce2fe7a9f5212f7af8d351b6041b27fb62b233c4ce19a6644f6bbd0d9022d8d44d670f50914db04acef395b74ded52556
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2054.3_alpha1.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.0_alpha1.ebuild
similarity index 95%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2054.3_alpha1.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.0_alpha1.ebuild
index a56009cb36ae..bd01162a424b 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2054.3_alpha1.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.0_alpha1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2054.3_alpha1.ebuild,v 1.1 2014/06/18 13:13:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/chrome-binary-plugins/chrome-binary-plugins-37.0.2062.0_alpha1.ebuild,v 1.1 2014/06/24 02:36:03 floppym Exp $
 
 EAPI=4