diff --git a/app-admin/denyhosts/denyhosts-2.6-r10.ebuild b/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
index ad08145b48fc..9a7771997fca 100644
--- a/app-admin/denyhosts/denyhosts-2.6-r10.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.6-r10.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/denyhosts/denyhosts-2.6-r10.ebuild,v 1.6 2014/09/07 10:47:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/denyhosts-2.6-r10.ebuild,v 1.7 2014/10/17 14:57:56 klausman Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/sysklogd/sysklogd-1.5.1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
index 2652874b60ab..9bc4022e6660 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.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/app-admin/sysklogd/sysklogd-1.5.1.ebuild,v 1.5 2014/10/16 10:26:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.5.1.ebuild,v 1.7 2014/10/17 13:26:51 ago Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="logrotate"
 RESTRICT="test"
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 688fbe64091d..19f272384cf8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,8 +1,6 @@
-DIST emacs-24.3.91.tar.xz 39423508 SHA256 40cee18cecd3a54b6b14dd2d9d46bf3de625a1649c39fa8826be42ad47dd217a SHA512 e944755ed464d269b535125f154127215ece9413e369286fe9d572bd32d9ef6160627a19644a9d80593c30d58412c55bb0559d06a7332d9090cb5fea718e1395 WHIRLPOOL f6b31889faa64a359969a33d319461865183d2a40ca61bab3398f07b9a939ac9f6ac8c9f84277e13682032a3f3efdcaf64c6dedf482a05c6c382373e8a27e826
 DIST emacs-24.3.92.tar.xz 39639748 SHA256 e5ae5097cbe22100550365e1022c171834a4b2bbcd663cf0850a10793b34beb7 SHA512 de9e534f4a61d1f4ef6a80445ad73c9ef5860fa7bc10e3f45440b0163aa1eaf3b213410168513bd72f01aeed5c2c5929fb70486fdabee48d7f1248c3ed8878ce WHIRLPOOL db471267cad1658c451154c97782bb83f7995136b5864da5ea69b678af5249df24b2587e1d2f6ed183503c3882211a5d4abadd7150be465eb3db6c56002045fc
 DIST emacs-24.3.93.tar.xz 39710980 SHA256 865434bbd17c6d1a5eb69f1aa62367d86dccba3e875c39f99749c351cc7ca67a SHA512 4a22f96248649a59f01b40f5a3eca9d8f599815e5983f6093bf44da5dcbdd7918777ae28cb68c1e8964bdc6d943f1c88a30eef9a56582fa2bbe9294110a9fd30 WHIRLPOOL a93a19f32dc4a57e2f3812af9ee81c6b763937377aa3b93a2e158a0e0daabec572214fa7e1172fdb89012f930cdbf8096f1e788820daf6781c334258e9f9ed34
 DIST emacs-24.3.94.tar.xz 39709608 SHA256 5751cac3e1604ad100f9847ff8a429c1b0907b26032152c040e89f294e515bc2 SHA512 a1b6e4256684680d2f553a7887678fbc61418dd8a43968b516d6398bf77812786db1208735798700bfcb9aaed9373769460dba5e68051c7ac8cfd895e08c7095 WHIRLPOOL 49693335656ad8ae18aaf11e5e7e4bcb863b6a30436de6c17dcfe8b37142eba80644964709bc5cb95bf8df97364e2a43e7c884457526b1c511d8ece62a22cf08
-DIST emacs-24.4.50_pre20140630.tar.xz 24254808 SHA256 b0572905e0c03130d98c109bc587b0ea7bc9e3a4c86bc936e947707c8c9de7bd SHA512 03744241af70478a4932f8069a821dfe111e5a37fe56d5f7ee151aea0cfcc2a78d3657c46e8ac3897f744c94c118350f350262fed9982b2d09892e65a3084087 WHIRLPOOL edd2b1d37052b55ef761828b130a76ab00e661d4cd65b6698e03974bb9809007fda79161e7cb90d22fdfd0fe0becd0fc3e1c77c3686b3d9051af6fe6b5c6fa51
 DIST emacs-24.4.50_pre20140731.tar.xz 24297368 SHA256 4b91f9038f4d9f456caa587d2b89af734a894f508389ec08c09d1e3d53672501 SHA512 f70d7a5a38b634c9dc6d18ea34ec725888b6372a85fb46e3818fb43773a8378e52e07c23a8f59f93b417b27c6c12e3108ed1115adf06d0a05a7ed85d45b2de07 WHIRLPOOL 3c844819a78d56fe3f007be7d2f6fc635785cabaed9482eb8c8654f4aae1740a284214d75f63036ab7389afa815251835db05823d0ee7a516209e1144506140c
 DIST emacs-24.4.50_pre20140831.tar.xz 24312560 SHA256 ea61b4be2d65948a358f076d41dcb6d47a887f5f01cd691378ce4108417300b8 SHA512 4f2b7f6a2036dae95ffcae51374afe3c9122d909129e71092de7344798402a1d2b7a6197535b7e00889c2032a411ded2e510a579ee154b572efc81574a0aa0f3 WHIRLPOOL 5b9946c07f91f2499a3288859422a450b8beb9cab983ca2f29c500d4486ee9fbd431606cf28501817b776f3cd10ed990989efec80487da79607187d3fccd4e29
 DIST emacs-24.4.50_pre20140929.tar.xz 24341884 SHA256 06a32322c49390e9859f3743e4c0c348c1206d7dc5c33bd3d5248bc642a533df SHA512 7063eaa5e10006c967b7969624bc024ab22c6ac7583ecb631333fe973381325deecca5d3585fd61b55580198bebb900d477c2071f7016f393aa56fcb10b0b9b0 WHIRLPOOL 21eb7d5059aa631055416b6c4971700489653902e29fd0032510ad13b2279dcd6c9f42978101cd4d522baa7eb6014b4308be4a2f6de2f90a12858c467a3b9b2f
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
deleted file mode 100644
index 1753dd82f387..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild,v 1.5 2014/05/16 20:10:42 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="emacs-24"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-	EBZR_WORKDIR_CHECKOUT="t"	#434746
-	inherit bzr
-	S="${EBZR_UNPACK_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild
deleted file mode 100644
index 0bbfb4958975..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild,v 1.1 2014/07/07 07:09:39 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-	EBZR_WORKDIR_CHECKOUT="t"	#434746
-	inherit bzr
-	S="${EBZR_UNPACK_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
similarity index 98%
rename from app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
rename to app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
index 48ccab885965..33ae03bd548d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.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/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild,v 1.2 2014/05/16 20:10:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild,v 1.1 2014/10/17 14:10:13 ulm Exp $
 
 EAPI=5
 
@@ -19,6 +19,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -31,7 +32,6 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 82a321352240..7368fde87254 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -3,4 +3,4 @@ DIST mariadb-5.5.39.tar.gz 45084762 SHA256 cb850865ab55ce5f01c99a612cc75b76ead5d
 DIST mariadb-5.5.40.tar.gz 44745240 SHA256 cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512 178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac WHIRLPOOL 1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
 DIST mysql-extras-20140817-2320Z.tar.bz2 1495153 SHA256 9a32dcc646c86cb8f9a941f4da6fd9fc183c0bd60faf47331d465e422ff7b8ac SHA512 d4eb8451a894206cc2d1f3431f6106a910495d357cc07b4e6088b545fc39a995a1d230a307467da73c8c6b11efa0eda634150e09a486a9c53fb063c7fa8d9bbc WHIRLPOOL f57573e6d3ca9f37c666848f07f65f963ed70cfe4e3408730e96be68073251a7611cad068c1d84a5fbfe42ee7c5f9e161d7962dcf591e6eae856ef1cfd286e9f
 DIST mysql-extras-20140924-1913Z.tar.bz2 1494659 SHA256 958114bbe5fe21220f27b478c67a9ad3edd8d88fc58b528c6e7b5cf20e46dabb SHA512 b5fc435804b5843ecb9e522dbc8c6b5d2bb9bc8a7c39633032aaf566f2a2488fc6c0017a92dd6db95db6c14d06d25c43a67fb2387818a0060611c3c811491037 WHIRLPOOL a6a3b1953180923882de75d2e15cdbbf29f42c90947c88e1b29ceee3a2d8094eb5ee015ce2f38b13dbb84d52120be9e867618c90b655ffeec10d32947ce625d0
-DIST mysql-extras-20141009-1450Z.tar.bz2 1493940 SHA256 e19856db9b48305eaa61241ec0dd15d185feb8fd3400a29d5e52f72230dcb62f SHA512 5052ce06e72468058894cc8a8b6f5af668c92ccfa79801ae2fcb05f52f3a1d2e5d2776905952378b94e5ef5096c5e9d59a9efa0979f968770cd85a332df418cd WHIRLPOOL d997bfc7188560e53a7d534299b2631517e601028defb538a7c4108b2170328239497c8c849af2cc5e4994517b3bb2ee0cd595d173089074b002468b46effc3d
+DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
diff --git a/dev-db/mariadb/mariadb-5.5.40.ebuild b/dev-db/mariadb/mariadb-5.5.40-r1.ebuild
similarity index 93%
rename from dev-db/mariadb/mariadb-5.5.40.ebuild
rename to dev-db/mariadb/mariadb-5.5.40-r1.ebuild
index cd090b79a3ab..031b0060afcc 100644
--- a/dev-db/mariadb/mariadb-5.5.40.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.40-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-db/mariadb/mariadb-5.5.40.ebuild,v 1.5 2014/10/17 06:46:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.40-r1.ebuild,v 1.1 2014/10/17 14:35:12 grknight Exp $
 
 EAPI="5"
-MY_EXTRAS_VER="20141009-1450Z"
+MY_EXTRAS_VER="20141017-1419Z"
 
 # Build system
 BUILD="cmake"
@@ -13,7 +13,7 @@ inherit toolchain-funcs mysql-v2
 IUSE="$IUSE"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-db/mysql/mysql-5.5.40.ebuild b/dev-db/mysql/mysql-5.5.40.ebuild
index f82463d93ea1..06546cf20ced 100644
--- a/dev-db/mysql/mysql-5.5.40.ebuild
+++ b/dev-db/mysql/mysql-5.5.40.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-db/mysql/mysql-5.5.40.ebuild,v 1.8 2014/10/17 06:46:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.40.ebuild,v 1.10 2014/10/17 13:26:42 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ IUSE="$IUSE"
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''
diff --git a/dev-lang/perl/perl-5.18.2-r2.ebuild b/dev-lang/perl/perl-5.18.2-r2.ebuild
index 05ba2cb3d32a..f8b09d141d8f 100644
--- a/dev-lang/perl/perl-5.18.2-r2.ebuild
+++ b/dev-lang/perl/perl-5.18.2-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-lang/perl/perl-5.18.2-r2.ebuild,v 1.6 2014/10/16 15:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.18.2-r2.ebuild,v 1.8 2014/10/17 13:27:15 ago Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index aea2f24ce689..90b84a66785c 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -1,9 +1,8 @@
 DIST php-5.3.29.tar.bz2 11396771 SHA256 c4e1cf6972b2a9c7f2777a18497d83bf713cdbecabb65d3ff62ba441aebb0091 SHA512 c22c463df7371bbd97beb258f0a9b9d77ec5c3c733fc565091e2bfcda3da2f1d2ab406047afcc70a6da2331acd2698885328d5a334c9922fa7591852eefda5f7 WHIRLPOOL bb9db8ba267016af18d0d993e764561b11d6fc1302ed139d2b047ec84f139b078faf53d27a7dd394b0972199b3990c34a77ef1e2f7b632ceb5660cb1667bf0ab
 DIST php-5.4.32.tar.bz2 12277458 SHA256 26d0717669a098f18cd22dc3ae8282101d38508054500c26775ddcc26ca7c826 SHA512 a2bf1c4977bfb36502163f5fd1ba81b6d7ac2a99f77c7e584761efbd6bbbc3ba0ec493ccc5bf61d78f956c8666b84b1b4bbfbbb778d2834541b47a9a5cfd63e0 WHIRLPOOL 718edbce480fe3b8b9a360d35b07cb9cfb629bc1d1182f0f434b072f514f9f94e90490079cff7754b128ca3f33e27b72ec73bec9b321c3a8c7d10496b36d4c52
-DIST php-5.4.33.tar.bz2 12280453 SHA256 1a75b2d0835e74b8886cd3980d9598a0e06691441bb7f91d19b74c2278e40bb5 SHA512 c7a97db745aa77c2deccea022d97732bce736ccd481a7b6c63d7da79ce3d1a4d13d3f4968bfdab3ac1091a23dd6a243f3d3b0b2ac688205decc944d3d6ecf347 WHIRLPOOL 34b9a274d248a05b0d7c133a697a1b2c682cd8be0d15ae9377f4011ae1290eaba26775b3ac09276e4a4ce89dc55d728e0af68735789427c670bd0a09dc496364
+DIST php-5.4.34.tar.bz2 12277163 SHA256 57d4ea10f0c18b096a7c8fd0a98dcbe40c8f4dc94453fd3ca0a10e35fb2f8234 SHA512 69355836a98fa66c32c6a8078dc593b50c9f432657b282811442aa47b13bf926e6a9a4c15bac9c793725a87499f765b89b605081279759c527e410dfd189912f WHIRLPOOL 2e0959209cb384b294ee5ca0852dc752e7743ec1eaa129497a6bf5f1a6352f1829b90a5bb336ec3f68bbecfdb3fd72ed8cd6a41d03dd1e8c7391ca05e9d0a437
 DIST php-5.5.16.tar.bz2 13257031 SHA256 a1d7c4556a80bed744a348211b33bc35303edd56dd0a34e0a75a948c879cc5f6 SHA512 609e08cbc4974b356f81cd538d5f875befeaca83fbdb410c1980b420577da19148321a0c99b3494cd06f341571f00f2d381748900d4bad17c8240e4d6e90f7af WHIRLPOOL 715f3ba0230f3987c488a1f67b2bc542d8ef183b8ee0096fed0fcd6cf54c1173c04358ab3e6e4816814b2d7b7da88d396483e2a95ee566c0bf2feba5f6c59469
-DIST php-5.5.17.tar.bz2 13269227 SHA256 5d81db0c8b2a68da05715c363d037922b82a45c966785d64a77482e5c01e4e1b SHA512 898ab5ae1bcd7def149d63c919cbffa2d9708052a230465d39e53b46d39ec124f52ba31e6440f0ad96ec1e6e4fe4dec3e52bcb4f9a2e7d0af7cdcc94e81e493b WHIRLPOOL b606bb596cfffcc9f3ded6b0c2e2bc18ac5412713beb2a357ae6e93886a8a20119749b33a41cc8fb8d3f9e74b9585b1f66f71d16e4ebe781afc8ded7f9f4bf23
-DIST php-5.6.0.tar.bz2 13547979 SHA256 097af1be34fc73965e6f8401fd10e73eb56e1969ed4ffd691fb7e91606d0fc09 SHA512 a43e48650f6c9de7a0490a30c5b50fd8394698eeb0568303138013511ee4a31fbf231c1cf4b8ec972e92afca9c5169017921b108a526bfbeadef149049bf1d2e WHIRLPOOL 5076696f216570d4b3af125672f2f3ac4124c87ce9b40e13f58d3f81b058dbc5f59f43af512cc33beebc6071b05ffd7d33157aae718ace7fc27cd124c2ab019b
-DIST php-5.6.1.tar.bz2 13455884 SHA256 82c1ccd17830d697d7a4d75bb60ea12be58fa80b4dba101e97db1a6372ca45f0 SHA512 22839e6e8a365c14d26febbc4a75a8afbf3d3f4ad31b300e356ac4d2857562dae9a1fcf12bbb509452147cdef11006e437a4d67f5d692f76d8e203783f82631f WHIRLPOOL 21d80da8036641e3059b9fc482e0d76a833a3d5c96ef7683c7b3d3715be4904b73d1e0c3152650620b809600699a3eee36b8018fdb41f156e59dd0e1e03862d2
+DIST php-5.5.18.tar.bz2 13276408 SHA256 f974279927b72b672dda4ef4b4362b4847fd3d19ce1d4f2e982230a4e93bb842 SHA512 398f2a5c1993a748d7713e44ae24098819dfa96550c17e4c868c656b653b525989d4e2d5daa1446cf04dd4408d51f9839a2d7728c70145b54c5a220d15fb2953 WHIRLPOOL b19a0dc1d6af1b3fb24f8521d769639bd7f7c857272ef4806afd8a058bd217343f57cc6111c06b6515aac607d33b9e26406ff67bf014aef69febcef5443b5077
+DIST php-5.6.2.tar.bz2 13453318 SHA256 671dcf1f636410c63bb9eb015c4c180d904f5436f81217be0adbf52da9becdb5 SHA512 b2e380a15c94a1ac6005aa5ad5953e31ef11a6ef83fd296c927bd55be23ab3c91e5e4d908e49086c87229bf7da18e8a523132bb372abb4d5943ff1ea7f91529c WHIRLPOOL 95b96f413e2a4097ab0153ad9c985b742d3dbf30fa38d659bb3d60ae345bf1b233a2c9b7a97eaf15fc99195c281362ed0159a3de24dfb4850cde9fed28273b3e
 DIST php-patchset-5.3-r0.tar.bz2 7368 SHA256 1a67b34a681dea33ea38f0ffc32b70a78b4c5dc1c3603d1bba31bb130d803ef7 SHA512 765b0cf56a3e63ded4ad1d1ba67567881ad06bdc2814cc07004fa338f38fd69078819c7463d2c55e00805c8f33fa925b94228bf7bc3d223acc33c6cff540024c WHIRLPOOL 59e18b33e11d968fac2a4571173121bf8141bb2f1eab62192e15bc59e351d3ab973f04343b447681d8a2adddf0844edb8a481d027bfc14c7e1fd8222169094ec
 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea
diff --git a/dev-lang/php/php-5.4.33.ebuild b/dev-lang/php/php-5.4.34.ebuild
similarity index 98%
rename from dev-lang/php/php-5.4.33.ebuild
rename to dev-lang/php/php-5.4.34.ebuild
index 46c54d8d97c6..ac7eeb1af472 100644
--- a/dev-lang/php/php-5.4.33.ebuild
+++ b/dev-lang/php/php-5.4.34.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-lang/php/php-5.4.33.ebuild,v 1.2 2014/10/10 18:04:18 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.34.ebuild,v 1.1 2014/10/17 12:33:51 olemarkus Exp $
 
 EAPI=5
 
@@ -778,7 +778,7 @@ pkg_postinst() {
 		fi
 	done
 
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-} in order"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
 	elog "to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
@@ -788,7 +788,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
 	elog
diff --git a/dev-lang/php/php-5.5.17.ebuild b/dev-lang/php/php-5.5.17.ebuild
deleted file mode 100644
index b11e918f5e7d..000000000000
--- a/dev-lang/php/php-5.5.17.ebuild
+++ /dev/null
@@ -1,784 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.17.ebuild,v 1.2 2014/10/10 18:04:18 grknight Exp $
-
-EAPI=5
-
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-function php_get_uri ()
-{
-	case "${1}" in
-		"php-pre")
-			echo "http://downloads.php.net/dsp/${2}"
-		;;
-		"php")
-			echo "http://www.php.net/distributions/${2}"
-		;;
-		"olemarkus")
-			echo "http://dev.gentoo.org/~olemarkus/php/${2}"
-		;;
-		"gentoo")
-			echo "mirror://gentoo/${2}"
-		;;
-		*)
-			die "unhandled case in php_get_uri"
-		;;
-	esac
-}
-
-PHP_MV="$(get_major_version)"
-SLOT="$(get_version_component_range 1-2)"
-
-# alias, so we can handle different types of releases (finals, rcs, alphas,
-# betas, ...) w/o changing the whole ebuild
-PHP_PV="${PV/_rc/RC}"
-PHP_PV="${PHP_PV/_alpha/alpha}"
-PHP_PV="${PHP_PV/_beta/beta}"
-PHP_RELEASE="php"
-[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre"
-[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre"
-PHP_P="${PN}-${PHP_PV}"
-
-PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
-
-PHP_FPM_CONF_VER="1"
-
-SRC_URI="${PHP_SRC_URI}"
-
-DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs"
-HOMEPAGE="http://php.net/"
-LICENSE="PHP-3"
-
-S="${WORKDIR}/${PHP_P}"
-
-# We can build the following SAPIs in the given order
-SAPIS="embed cli cgi fpm apache2"
-
-# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
-IUSE="${IUSE}
-	${SAPIS/cli/+cli}
-	threads"
-
-IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
-	crypt +ctype curl debug
-	enchant exif frontbase +fileinfo +filter firebird
-	flatfile ftp gd gdbm gmp +hash +iconv imap inifile
-	intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
-	mssql mysql libmysqlclient mysqli nls
-	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
-	readline recode selinux +session sharedmem
-	+simplexml snmp soap sockets spell sqlite ssl
-	sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx
-	+xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib"
-
-DEPEND="
-	>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?]
-	>=dev-libs/libpcre-8.32[unicode]
-	apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=]
-		<www-servers/apache-2.4[threads=] ) )
-	berkdb? ( =sys-libs/db-4* )
-	bzip2? ( app-arch/bzip2 )
-	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
-	cjk? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	crypt? ( >=dev-libs/libmcrypt-2.4 )
-	curl? ( >=net-misc/curl-7.10.5 )
-	enchant? ( app-text/enchant )
-	exif? ( !gd? (
-		virtual/jpeg:0
-		media-libs/libpng:0=
-		sys-libs/zlib
-	) )
-	firebird? ( dev-db/firebird )
-	gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	gmp? ( >=dev-libs/gmp-4.1.2 )
-	iconv? ( virtual/libiconv )
-	imap? ( virtual/imap-c-client[ssl=] )
-	intl? ( dev-libs/icu:= )
-	iodbc? ( dev-db/libiodbc )
-	kerberos? ( virtual/krb5 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
-	libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
-	mssql? ( dev-db/freetds[mssql] )
-	libmysqlclient? (
-		mysql? ( virtual/mysql )
-		mysqli? ( >=virtual/mysql-4.1 )
-	)
-	nls? ( sys-devel/gettext )
-	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	postgres? ( dev-db/postgresql-base )
-	qdbm? ( dev-db/qdbm )
-	readline? ( sys-libs/readline )
-	recode? ( app-text/recode )
-	sharedmem? ( dev-libs/mm )
-	simplexml? ( >=dev-libs/libxml2-2.6.8 )
-	snmp? ( >=net-analyzer/net-snmp-5.2 )
-	soap? ( >=dev-libs/libxml2-2.6.8 )
-	spell? ( >=app-text/aspell-0.50 )
-	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
-	ssl? ( >=dev-libs/openssl-0.9.7 )
-	sybase-ct? ( dev-db/freetds )
-	tidy? ( app-text/htmltidy )
-	truetype? (
-		=media-libs/freetype-2*
-		>=media-libs/t1lib-5.0.0
-		!gd? (
-			virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib )
-	)
-	unicode? ( dev-libs/oniguruma )
-	vpx? ( media-libs/libvpx )
-	wddx? ( >=dev-libs/libxml2-2.6.8 )
-	xml? ( >=dev-libs/libxml2-2.6.8 )
-	xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
-	xmlreader? ( >=dev-libs/libxml2-2.6.8 )
-	xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
-	xpm? (
-		x11-libs/libXpm
-		virtual/jpeg:0
-		media-libs/libpng:0= sys-libs/zlib
-	)
-	xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
-	zip? ( sys-libs/zlib )
-	zlib? ( sys-libs/zlib )
-	virtual/mta
-"
-
-php="=${CATEGORY}/${PF}"
-
-REQUIRED_USE="
-	truetype? ( gd )
-	vpx? ( gd )
-	cjk? ( gd )
-	exif? ( gd )
-
-	xpm? ( gd )
-	gd? ( zlib )
-	simplexml? ( xml )
-	soap? ( xml )
-	wddx? ( xml )
-	xmlrpc? ( || ( xml iconv ) )
-	xmlreader? ( xml )
-	xslt? ( xml )
-	ldap-sasl? ( ldap )
-	mhash? ( hash )
-	phar? ( hash )
-	libmysqlclient? ( || (
-		mysql
-		mysqli
-		pdo
-	) )
-
-	qdbm? ( !gdbm )
-	readline? ( !libedit )
-	recode? ( !imap !mysql !mysqli )
-	sharedmem? ( !threads )
-
-	!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
-
-RDEPEND="${DEPEND}"
-
-RDEPEND="${RDEPEND}
-	fpm? (
-		selinux? ( sec-policy/selinux-phpfpm )
-		systemd? ( sys-apps/systemd ) )"
-
-DEPEND="${DEPEND}
-	sys-devel/flex
-	>=sys-devel/m4-1.4.3
-	>=sys-devel/libtool-1.5.18"
-
-# Allow users to install production version if they want to
-
-case "${PHP_INI_VERSION}" in
-	production|development)
-		;;
-	*)
-		PHP_INI_VERSION="development"
-		;;
-esac
-
-PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
-PHP_INI_FILE="php.ini"
-
-want_apache
-
-pkg_setup() {
-	depend.apache_pkg_setup
-}
-
-php_install_ini() {
-	local phpsapi="${1}"
-
-	# work out where we are installing the ini file
-	php_set_ini_dir "${phpsapi}"
-
-	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
-	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"
-
-	# default to /tmp for save_path, bug #282768
-	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}"
-
-	# Set the extension dir
-	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"
-
-	# Set the include path to point to where we want to find PEAR packages
-	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}"
-
-	dodir "${PHP_INI_DIR#${EPREFIX}}"
-	insinto "${PHP_INI_DIR#${EPREFIX}}"
-	newins "${phpinisrc}" "${PHP_INI_FILE}"
-
-	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
-	elog
-
-	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
-	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
-
-	if use_if_iuse opcache; then
-		elog "Adding opcache to $PHP_EXT_INI_DIR"
-		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
-		dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
-	fi
-
-	# SAPI-specific handling
-
-	if [[ "${sapi}" == "fpm" ]] ; then
-		[[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0
-		einfo "Installing FPM CGI config file php-fpm.conf"
-		insinto "${PHP_INI_DIR#${EPREFIX}}"
-		newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf
-
-		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
-		[[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default"
-	fi
-
-	# Install PHP ini files into /usr/share/php
-
-	dodoc php.ini-development
-	dodoc php.ini-production
-
-}
-
-php_set_ini_dir() {
-	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
-	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
-	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
-}
-
-src_prepare() {
-	# USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path
-	# ([empty session.save_path]/session_mm_[sapi][gid].sem)
-	# there is no easy way to circumvent that, all php calls during
-	# install use -n, so no php.ini file will be used.
-	# As such, this is the easiest way to get around
-	addpredict /session_mm_cli250.sem
-	addpredict /session_mm_cli0.sem
-
-	# Change PHP branding
-	# Get the alpha/beta/rc version
-	sed -re	"s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \
-		-i configure.in || die "Unable to change PHP branding"
-
-	# Patch PHP to show Gentoo as the server platform
-	sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \
-		-i configure.in || die "Failed to fix server platform name"
-
-	# Prevent PHP from activating the Apache config,
-	# as we will do that ourselves
-	sed -i \
-		-e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		-e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \
-		configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4
-
-	# Patch PHP to support heimdal instead of mit-krb5
-	if has_version "app-crypt/heimdal" ; then
-		sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal libname"
-		sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \
-			|| die "Failed to fix heimdal crypt library reference"
-	fi
-
-	#Add user patches #357637
-	epatch_user
-
-	#force rebuilding aclocal.m4
-	rm aclocal.m4
-	eautoreconf
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# http://bugs.php.net/bug.php?id=48795, bug #343481
-		sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die
-	fi
-}
-
-src_configure() {
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
-
-	# This is a global variable and should be in caps. It isn't because the
-	# phpconfutils eclass relies on exactly this name...
-	# for --with-libdir see bug #327025
-	my_conf="
-		--prefix="${PHP_DESTDIR}"
-		--mandir="${PHP_DESTDIR}"/man
-		--infodir="${PHP_DESTDIR}"/info
-		--libdir="${PHP_DESTDIR}"/lib
-		--with-libdir=$(get_libdir)
-		--without-pear
-		$(use_enable threads maintainer-zts)"
-
-	#                             extension		  USE flag        shared
-	my_conf+="
-	$(use_enable bcmath bcmath )
-	$(use_with bzip2 bz2 "${EPREFIX}"/usr)
-	$(use_enable calendar calendar )
-	$(use_enable ctype ctype )
-	$(use_with curl curl "${EPREFIX}"/usr)
-	$(use_enable xml dom )
-	$(use_with enchant enchant "${EPREFIX}"/usr)
-	$(use_enable exif exif )
-	$(use_enable fileinfo fileinfo )
-	$(use_enable filter filter )
-	$(use_enable ftp ftp )
-	$(use_with nls gettext "${EPREFIX}"/usr)
-	$(use_with gmp gmp "${EPREFIX}"/usr)
-	$(use_enable hash hash )
-	$(use_with mhash mhash "${EPREFIX}"/usr)
-	$(use_with iconv iconv $(use elibc_glibc || echo "${EPREFIX}"/usr))
-	$(use_enable intl intl )
-	$(use_enable ipv6 ipv6 )
-	$(use_enable json json )
-	$(use_with kerberos kerberos "${EPREFIX}"/usr)
-	$(use_enable xml libxml )
-	$(use_with xml libxml-dir "${EPREFIX}"/usr)
-	$(use_enable unicode mbstring )
-	$(use_with crypt mcrypt "${EPREFIX}"/usr)
-	$(use_with mssql mssql "${EPREFIX}"/usr)
-	$(use_with unicode onig "${EPREFIX}"/usr)
-	$(use_with ssl openssl "${EPREFIX}"/usr)
-	$(use_with ssl openssl-dir "${EPREFIX}"/usr)
-	$(use_enable pcntl pcntl )
-	$(use_enable phar phar )
-	$(use_enable pdo pdo )
-	$(use_enable opcache opcache )
-	$(use_with postgres pgsql "${EPREFIX}"/usr)
-	$(use_enable posix posix )
-	$(use_with spell pspell "${EPREFIX}"/usr)
-	$(use_with recode recode "${EPREFIX}"/usr)
-	$(use_enable simplexml simplexml )
-	$(use_enable sharedmem shmop )
-	$(use_with snmp snmp "${EPREFIX}"/usr)
-	$(use_enable soap soap )
-	$(use_enable sockets sockets )
-	$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
-	$(use_with sybase-ct sybase-ct "${EPREFIX}"/usr)
-	$(use_enable sysvipc sysvmsg )
-	$(use_enable sysvipc sysvsem )
-	$(use_enable sysvipc sysvshm )
-	$(use_with systemd fpm-systemd)
-	$(use_with tidy tidy "${EPREFIX}"/usr)
-	$(use_enable tokenizer tokenizer )
-	$(use_enable wddx wddx )
-	$(use_enable xml xml )
-	$(use_enable xmlreader xmlreader )
-	$(use_enable xmlwriter xmlwriter )
-	$(use_with xmlrpc xmlrpc)
-	$(use_with xslt xsl "${EPREFIX}"/usr)
-	$(use_enable zip zip )
-	$(use_with zlib zlib "${EPREFIX}"/usr)
-	$(use_enable debug debug )"
-
-	# DBA support
-	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
-		|| use qdbm ; then
-		my_conf="${my_conf} --enable-dba${shared}"
-	fi
-
-	# DBA drivers support
-	my_conf+="
-	$(use_with cdb cdb)
-	$(use_with berkdb db4 ${EPREFIX}/usr)
-	$(use_enable flatfile flatfile )
-	$(use_with gdbm gdbm ${EPREFIX}/usr)
-	$(use_enable inifile inifile )
-	$(use_with qdbm qdbm ${EPREFIX}/usr)"
-
-	# Support for the GD graphics library
-	my_conf+="
-	$(use_with truetype freetype-dir ${EPREFIX}/usr)
-	$(use_with truetype t1lib ${EPREFIX}/usr)
-	$(use_enable cjk gd-jis-conv )
-	$(use_with gd jpeg-dir ${EPREFIX}/usr)
-	$(use_with gd png-dir ${EPREFIX}/usr)
-	$(use_with xpm xpm-dir ${EPREFIX}/usr)
-	$(use_with vpx vpx-dir ${EPREFIX}/usr)"
-	# enable gd last, so configure can pick up the previous settings
-	my_conf+="
-	$(use_with gd gd)"
-
-	# IMAP support
-	if use imap ; then
-		my_conf+="
-		$(use_with imap imap ${EPREFIX}/usr)
-		$(use_with ssl imap-ssl ${EPREFIX}/usr)"
-	fi
-
-	# Interbase/firebird support
-
-	if use firebird ; then
-		my_conf+="
-		$(use_with firebird interbase ${EPREFIX}/usr)"
-	fi
-
-	# LDAP support
-	if use ldap ; then
-		my_conf+="
-		$(use_with ldap ldap ${EPREFIX}/usr)
-		$(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)"
-	fi
-
-	# MySQL support
-	local mysqllib="mysqlnd"
-	local mysqlilib="mysqlnd"
-	use libmysqlclient && mysqllib="${EPREFIX}/usr"
-	use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config"
-
-	my_conf+=" $(use_with mysql mysql $mysqllib)"
-	my_conf+=" $(use_with mysqli mysqli $mysqlilib)"
-
-	local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)"
-	if use mysql ; then
-		my_conf+="${mysqlsock}"
-	elif use mysqli ; then
-		my_conf+="${mysqlsock}"
-	fi
-
-	# ODBC support
-	if use odbc ; then
-		my_conf+="
-		$(use_with odbc unixODBC ${EPREFIX}/usr)"
-	fi
-
-	if use iodbc ; then
-		my_conf+="
-		$(use_with iodbc iodbc ${EPREFIX}/usr)"
-	fi
-
-	# Oracle support
-	if use oci8-instant-client ; then
-		my_conf+="
-		$(use_with oci8-instant-client oci8)"
-	fi
-
-	# PDO support
-	if use pdo ; then
-		my_conf+="
-		$(use_with mssql pdo-dblib )
-		$(use_with mysql pdo-mysql ${mysqllib})
-		$(use_with postgres pdo-pgsql )
-		$(use_with sqlite pdo-sqlite ${EPREFIX}/usr)
-		$(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)"
-		if use oci8-instant-client ; then
-			my_conf+="
-			$(use_with oci8-instant-client pdo-oci)"
-		fi
-	fi
-
-	# readline/libedit support
-	my_conf+="
-	$(use_with readline readline ${EPREFIX}/usr)
-	$(use_with libedit libedit ${EPREFIX}/usr)"
-
-	# Session support
-	if use session ; then
-		my_conf+="
-		$(use_with sharedmem mm ${EPREFIX}/usr)"
-	else
-		my_conf+="
-		$(use_enable session session )"
-	fi
-
-	# Use pic for shared modules such as apache2's mod_php
-	my_conf="${my_conf} --with-pic"
-
-	# we use the system copy of pcre
-	# --with-pcre-regex affects ext/pcre
-	# --with-pcre-dir affects ext/filter and ext/zip
-	my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr"
-
-	# Catch CFLAGS problems
-	# Fixes bug #14067.
-	# Changed order to run it in reverse for bug #32022 and #12021.
-	replace-cpu-flags "k6*" "i586"
-
-	# Support user-passed configuration parameters
-	my_conf="${my_conf} ${EXTRA_ECONF:-}"
-
-	# Support the Apache2 extras, they must be set globally for all
-	# SAPIs to work correctly, especially for external PHP extensions
-
-	mkdir -p "${WORKDIR}/sapis-build"
-	for one_sapi in $SAPIS ; do
-		use "${one_sapi}" || continue
-		php_set_ini_dir "${one_sapi}"
-
-		cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}"
-		cd "${WORKDIR}/sapis-build/${one_sapi}"
-
-		sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR}
-			--with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}"
-
-		for sapi in $SAPIS ; do
-			case "$sapi" in
-				cli|cgi|embed|fpm)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --enable-${sapi}"
-					else
-						sapi_conf="${sapi_conf} --disable-${sapi}"
-					fi
-					;;
-
-				apache2)
-					if [[ "${one_sapi}" == "${sapi}" ]] ; then
-						sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs"
-					else
-						sapi_conf="${sapi_conf} --without-apxs2"
-					fi
-					;;
-			esac
-		done
-
-		econf ${sapi_conf}
-	done
-}
-
-src_compile() {
-	# snmp seems to run during src_compile, too (bug #324739)
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/mib_indexes
-
-	for sapi in ${SAPIS} ; do
-		if use "${sapi}"; then
-			cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1"
-			emake || die "emake failed"
-		fi
-	done
-}
-
-src_install() {
-	# see bug #324739 for what happens when we don't have that
-	addpredict /usr/share/snmp/mibs/.index
-
-	# grab the first SAPI that got built and install common files from there
-	local first_sapi=""
-	for sapi in $SAPIS ; do
-		if use $sapi ; then
-			first_sapi=$sapi
-			break
-		fi
-	done
-
-	# Makefile forgets to create this before trying to write to it...
-	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
-
-	# Install php environment (without any sapis)
-	cd "${WORKDIR}/sapis-build/$first_sapi"
-	emake INSTALL_ROOT="${D}" \
-		install-build install-headers install-programs \
-		|| die "emake install failed"
-
-	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
-
-	# Create the directory where we'll put version-specific php scripts
-	keepdir /usr/share/php${PHP_MV}
-
-	local sapi="", file=""
-	local sapi_list=""
-
-	for sapi in ${SAPIS}; do
-		if use "${sapi}" ; then
-			einfo "Installing SAPI: ${sapi}"
-			cd "${WORKDIR}/sapis-build/${sapi}"
-
-			if [[ "${sapi}" == "apache2" ]] ; then
-				# We're specifically not using emake install-sapi as libtool
-				# may cause unnecessary relink failures (see bug #351266)
-				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
-				newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)"
-				keepdir "/usr/$(get_libdir)/apache2/modules"
-			else
-				# needed each time, php_install_ini would reset it
-				local dest="${PHP_DESTDIR#${EPREFIX}}"
-				into "${dest}"
-				case "$sapi" in
-					cli)
-						source="sapi/cli/php"
-						;;
-					cgi)
-						source="sapi/cgi/php-cgi"
-						;;
-					fpm)
-						source="sapi/fpm/php-fpm"
-						;;
-					embed)
-						source="libs/libphp${PHP_MV}$(get_libname)"
-						;;
-					*)
-						die "unhandled sapi in src_install"
-						;;
-				esac
-
-				if [[ "${source}" == *"$(get_libname)" ]]; then
-					dolib.so "${source}" || die "Unable to install ${sapi} sapi"
-				else
-					dobin "${source}" || die "Unable to install ${sapi} sapi"
-					local name="$(basename ${source})"
-					dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}"
-				fi
-			fi
-
-			php_install_ini "${sapi}"
-
-			# construct correct SAPI string for php-config
-			# thanks to ferringb for the bash voodoo
-			if [[ "${sapi}" == "apache2" ]]; then
-				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
-			else
-				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
-			fi
-		fi
-	done
-
-	# Installing opcache module
-	if use_if_iuse opcache ; then
-		dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module"
-	fi
-
-	# Install env.d files
-	newenvd "${FILESDIR}/20php5-envd" \
-		"20php${SLOT}"
-	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-	sed -e "s|php5|php${SLOT}|g" -i \
-		"${ED}/etc/env.d/20php${SLOT}"
-
-	# set php-config variable correctly (bug #278439)
-	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
-		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
-
-	if use fpm ; then
-		if use systemd; then
-			systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service"
-		else
-			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service"
-		fi
-	fi
-}
-
-src_test() {
-	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
-	if [[ ! -x "${PHP_BIN}" ]] ; then
-		ewarn "Test phase requires USE=cli, skipping"
-		return
-	else
-		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
-	fi
-
-	if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then
-		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi"
-	fi
-
-	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d "session.save_path=${T}" \
-		"${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}"
-
-	for name in ${EXPECTED_TEST_FAILURES}; do
-		mv "${name}.out" "${name}.out.orig" 2>/dev/null
-	done
-
-	local failed="$(find -name '*.out')"
-	if [[ ${failed} != "" ]] ; then
-		ewarn "The following test cases failed unexpectedly:"
-		for name in ${failed}; do
-			ewarn "  ${name/.out/}"
-		done
-	else
-		einfo "No unexpected test failures, all fine"
-	fi
-
-	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
-		local passed=""
-		for name in ${EXPECTED_TEST_FAILURES}; do
-			[[ -f "${name}.diff" ]] && continue
-			passed="${passed} ${name}"
-		done
-		if [[ ${passed} != "" ]] ; then
-			einfo "The following test cases passed unexpectedly:"
-			for name in ${passed}; do
-				ewarn "  ${passed}"
-			done
-		else
-			einfo "None of the known-to-fail tests passed, all fine"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	# Output some general info to the user
-	if use apache2 ; then
-		APACHE2_MOD_DEFINE="PHP5"
-		APACHE2_MOD_CONF="70_mod_php5"
-		apache-module_pkg_postinst
-	fi
-
-	# Create the symlinks for php
-	for m in ${SAPIS}; do
-		[[ ${m} == 'embed' ]] && continue;
-		if use $m ; then
-			local ci=$(eselect php show $m)
-			if [[ -z $ci ]]; then
-				eselect php set $m php${SLOT}
-				einfo "Switched ${m} to use php:${SLOT}"
-				einfo
-			elif [[ $ci != "php${SLOT}" ]] ; then
-				elog "To switch $m to use php:${SLOT}, run"
-				elog "    eselect php set $m php${SLOT}"
-				elog
-			fi
-		fi
-	done
-
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-} in order"
-	elog "to compile extensions for the ${SLOT} ABI"
-	elog
-	if ! use readline && use cli ; then
-		ewarn "Note that in order to use php interactivly, you need to enable"
-		ewarn "the readline USE flag or php -a will hang"
-	fi
-	elog
-	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
-	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
-	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
-
-	elog
-	elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
-	elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
-	elog
-}
-
-pkg_prerm() {
-	eselect php cleanup
-}
diff --git a/dev-lang/php/php-5.6.0.ebuild b/dev-lang/php/php-5.5.18.ebuild
similarity index 98%
rename from dev-lang/php/php-5.6.0.ebuild
rename to dev-lang/php/php-5.5.18.ebuild
index 2a8314468b01..b4ded3c65adf 100644
--- a/dev-lang/php/php-5.6.0.ebuild
+++ b/dev-lang/php/php-5.5.18.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-lang/php/php-5.6.0.ebuild,v 1.2 2014/10/10 18:04:18 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.18.ebuild,v 1.1 2014/10/17 12:33:51 olemarkus Exp $
 
 EAPI=5
 
@@ -760,7 +760,7 @@ pkg_postinst() {
 		fi
 	done
 
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-} in order"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
 	elog "to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
@@ -770,7 +770,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
 	elog
diff --git a/dev-lang/php/php-5.6.1.ebuild b/dev-lang/php/php-5.6.2.ebuild
similarity index 98%
rename from dev-lang/php/php-5.6.1.ebuild
rename to dev-lang/php/php-5.6.2.ebuild
index 6dffdf4f6e6b..179749d71766 100644
--- a/dev-lang/php/php-5.6.1.ebuild
+++ b/dev-lang/php/php-5.6.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-lang/php/php-5.6.1.ebuild,v 1.2 2014/10/10 18:04:18 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.6.2.ebuild,v 1.1 2014/10/17 12:33:51 olemarkus Exp $
 
 EAPI=5
 
@@ -760,7 +760,7 @@ pkg_postinst() {
 		fi
 	done
 
-	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/portage/make.conf includes php${SLOT/./-} in order"
+	elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order"
 	elog "to compile extensions for the ${SLOT} ABI"
 	elog
 	if ! use readline && use cli ; then
@@ -770,7 +770,7 @@ pkg_postinst() {
 	elog
 	elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
 	elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
-	elog "'production' or 'development' in ${EPREFIX}/etc/portage/make.conf"
+	elog "'production' or 'development' in ${EPREFIX}/etc/make.conf"
 	elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}"
 
 	elog
diff --git a/dev-libs/fribidi/fribidi-0.19.6.ebuild b/dev-libs/fribidi/fribidi-0.19.6.ebuild
index 6eb2602aead3..e9643a17374a 100644
--- a/dev-libs/fribidi/fribidi-0.19.6.ebuild
+++ b/dev-libs/fribidi/fribidi-0.19.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/dev-libs/fribidi/fribidi-0.19.6.ebuild,v 1.11 2014/08/10 17:43:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.6.ebuild,v 1.12 2014/10/17 14:26:38 klausman Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RESTRICT="test" #397347
diff --git a/dev-libs/hiredis/hiredis-0.11.0-r1.ebuild b/dev-libs/hiredis/hiredis-0.11.0-r1.ebuild
index 75c3f1d87e42..1b94b1d42d2e 100644
--- a/dev-libs/hiredis/hiredis-0.11.0-r1.ebuild
+++ b/dev-libs/hiredis/hiredis-0.11.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-libs/hiredis/hiredis-0.11.0-r1.ebuild,v 1.7 2014/10/05 15:06:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/hiredis/hiredis-0.11.0-r1.ebuild,v 1.8 2014/10/17 13:38:40 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://github.com/redis/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc x86 ~x86-fbsd ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-solaris"
 IUSE="static-libs"
 
 src_prepare() {
diff --git a/dev-libs/newt/newt-0.52.15.ebuild b/dev-libs/newt/newt-0.52.15.ebuild
index 992948bcc3cb..bec885681dd4 100644
--- a/dev-libs/newt/newt-0.52.15.ebuild
+++ b/dev-libs/newt/newt-0.52.15.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/newt/newt-0.52.15.ebuild,v 1.12 2014/10/10 15:22:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.15.ebuild,v 1.13 2014/10/17 15:05:28 klausman Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://fedorahosted.org/releases/n/e/newt/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="gpm tcl nls"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/nss/nss-3.16.5.ebuild b/dev-libs/nss/nss-3.16.5.ebuild
index adbf4f8a6a28..8856fdddcc8f 100644
--- a/dev-libs/nss/nss-3.16.5.ebuild
+++ b/dev-libs/nss/nss-3.16.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-libs/nss/nss-3.16.5.ebuild,v 1.6 2014/10/15 13:18:21 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.5.ebuild,v 1.8 2014/10/17 13:26:56 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
@@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cacert +nss-pem utils"
 
 DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/dev-libs/openssl/openssl-1.0.1j.ebuild b/dev-libs/openssl/openssl-1.0.1j.ebuild
index 47f1136f9c6d..556f1669ee89 100644
--- a/dev-libs/openssl/openssl-1.0.1j.ebuild
+++ b/dev-libs/openssl/openssl-1.0.1j.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/openssl/openssl-1.0.1j.ebuild,v 1.5 2014/10/16 15:27:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1j.ebuild,v 1.6 2014/10/17 12:36:40 blueness Exp $
 
 EAPI="4"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
 
 # The blocks are temporary just to make sure people upgrade to a
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
similarity index 97%
rename from dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild
rename to dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild
index 008dbbc4cae3..d18e892db044 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.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/ossp-uuid/ossp-uuid-1.6.2-r3.ebuild,v 1.2 2014/08/10 20:38:35 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r4.ebuild,v 1.1 2014/10/17 15:08:21 grknight Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_S="${WORKDIR}/${MY_P}/php"
 PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php5-3 php5-4 php5-5"
+USE_PHP="php5-5 php5-4"
 
 GENTOO_DEPEND_ON_PERL="no"
 
diff --git a/dev-perl/Switch/Switch-2.160.0-r1.ebuild b/dev-perl/Switch/Switch-2.160.0-r1.ebuild
index 1a5229a4ac4f..99a8fa2326ba 100644
--- a/dev-perl/Switch/Switch-2.160.0-r1.ebuild
+++ b/dev-perl/Switch/Switch-2.160.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-perl/Switch/Switch-2.160.0-r1.ebuild,v 1.3 2014/10/05 15:04:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Switch/Switch-2.160.0-r1.ebuild,v 1.4 2014/10/17 13:38:47 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A switch statement for Perl"
 SRC_URI+=" http://dev.gentoo.org/~tove/distfiles/perl-core/Switch/Switch-2.16-rt60380.patch"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.3-r2.ebuild
similarity index 83%
rename from dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild
rename to dev-php/pecl-uuid/pecl-uuid-1.0.3-r2.ebuild
index 2f0eeeffa511..b82334416248 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.0.3-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-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild,v 1.2 2014/08/10 21:04:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-uuid/pecl-uuid-1.0.3-r2.ebuild,v 1.1 2014/10/17 14:53:25 grknight Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ PHP_EXT_INIT="yes"
 PHP_EXT_ZENDEXT="no"
 DOCS="CREDITS"
 
-USE_PHP="php5-3 php5-4 php5-5"
+USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-pecl-r2
 
diff --git a/dev-python/dpkt/dpkt-1.8-r1.ebuild b/dev-python/dpkt/dpkt-1.8-r1.ebuild
new file mode 100644
index 000000000000..1f1e993392f9
--- /dev/null
+++ b/dev-python/dpkt/dpkt-1.8-r1.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-python/dpkt/dpkt-1.8-r1.ebuild,v 1.1 2014/10/17 15:59:45 mrueg Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols"
+HOMEPAGE="http://code.google.com/p/dpkt/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( AUTHORS CHANGES HACKING )
+
+python_test() {
+	"${PYTHON}" tests/test-perf2.py || die
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/falcon/Manifest b/dev-python/falcon/Manifest
index f99afcd4329d..33e185096f3b 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,2 +1,3 @@
 DIST falcon-0.1.6.tar.gz 186870 SHA256 325503ae704420b91ffcb4c188d5ab15ae467b6168d7ccfacf905db1667022e3 SHA512 033b06d643dc910d62830d42a559a1fa1933b93c8f93b136c0ba89429cf3eadd912b5512f2add2ae904c3ff192046718a8d40a53d3a05506dfc2722cf5437668 WHIRLPOOL 1d93d1ffae86a167ab278fff3d6d653ea6b4df41723ea21f5149fa7316145ca9d8d6b8cde7ec1d018699cdbd86ebec87f682fd7a0f887f9e3f2926b18b6282ab
 DIST falcon-0.1.7.tar.gz 193151 SHA256 15c22f481b6152cb625d44ee852ec02cf775cb49f1fc9fa71cbc8d4fcccfbe7c SHA512 665a0bdd02c8e9a0806c863164fde33a6a10a1ac8c2ec9c3194da0ca41e411c19ec5b2a84cce521abb510588c23b4bb5fab25af58d5c17fbbf8e7c3304839b9a WHIRLPOOL 598f43cc59fd0d160e8a0fdb50385306c88a6becb5982110b4d9bd981e61768f1d33b46a51e44dfd0ec93114d156a56c9046e62daa044077246befa90009563d
+DIST falcon-0.1.8.tar.gz 202170 SHA256 e16c0e3062c4d6977e3ce892807d7e822c622f2743d9d97bd8be9babee29b63b SHA512 e0ec028c1d1dc3fba722bd91f9bb315523367313bef40238579a96ca49de37f4c63e53746bf6ab40add053320925378860e3571e32401151c00d4afcbad9b7ca WHIRLPOOL 1fa22d3167a12f992c5974864020ddcc89d6c9001d324e972b3e9fd8040ab8577cf955488c869fde662e0dfa98ed8c24e26f36b9b81ac9c282838aea6684e809
diff --git a/dev-python/falcon/falcon-0.1.8.ebuild b/dev-python/falcon/falcon-0.1.8.ebuild
new file mode 100644
index 000000000000..55ad2621cc68
--- /dev/null
+++ b/dev-python/falcon/falcon-0.1.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/falcon/falcon-0.1.8.ebuild,v 1.1 2014/10/17 14:55:51 ultrabug Exp $
+
+EAPI=5
+
+# Python 2.6 is supported, but depends on ordereddict, which has been in
+# improvise for months and is a minimal package. If needed
+# please let me know. PyPy also works
+PYTHON_COMPAT=( python{2_7,3_3} pypy pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="A supersonic micro-framework for building cloud APIs"
+HOMEPAGE="http://falconframework.org/ https://pypi.python.org/pypi/falcon"
+SRC_URI="https://github.com/racker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cython test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/mimeparse[${PYTHON_USEDEP}]
+	cython? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})] )"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/cython[$(python_gen_usedep python{2_7,3_3})]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}] )"
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
+
+src_prepare() {
+	if ! use cython; then
+		sed -i -e 's/if with_cython:/if False:/' setup.py \
+			|| die 'sed failed.'
+	fi
+
+	# fix tests installation : potential file collision
+	sed -e 's@^where = tests@where = falcon/tests@g' -i setup.cfg || die
+	mv tests falcon/
+}
diff --git a/dev-python/python-ldap/python-ldap-2.4.18.ebuild b/dev-python/python-ldap/python-ldap-2.4.18.ebuild
index de9a28883e93..1e4d6cbd4db2 100644
--- a/dev-python/python-ldap/python-ldap-2.4.18.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.4.18.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/python-ldap/python-ldap-2.4.18.ebuild,v 1.2 2014/10/17 11:17:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.4.18.ebuild,v 1.3 2014/10/17 15:49:51 idella4 Exp $
 
 EAPI=5
 
@@ -21,14 +21,14 @@ IUSE="doc examples sasl ssl"
 # If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
 # python team: Please do not remove python-ldap-2.3.9 from the tree.
 # OpenSSL is an optional runtime dep.
-# setup.py's install_requires entry is a debacle.
+# setup.py incorrectly sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
 RDEPEND=">net-nds/openldap-2.4.11
 	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
 	sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
 	sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
@@ -67,7 +67,7 @@ python_test() {
 }
 
 python_install_all() {
-.	use examples && local EXAMPLES=( Demo/. )
+	use examples && local EXAMPLES=( Demo/. )
 	use doc && local HTML_DOCS=( Doc/.build/html/. )
 
 	distutils-r1_python_install_all
diff --git a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild b/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
index 49fa91d64c63..1b4ce0a6693a 100644
--- a/dev-python/pyxdg/pyxdg-0.25-r1.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.25-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-python/pyxdg/pyxdg-0.25-r1.ebuild,v 1.7 2014/10/16 12:05:38 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.25-r1.ebuild,v 1.9 2014/10/17 13:27:01 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~takluyver/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="test"
 
 DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}]
diff --git a/eclass/gnatbuild.eclass b/eclass/gnatbuild.eclass
index ef7ae2ace763..fa5f7c34883d 100644
--- a/eclass/gnatbuild.eclass
+++ b/eclass/gnatbuild.eclass
@@ -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/eclass/gnatbuild.eclass,v 1.62 2014/10/15 09:52:21 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.63 2014/10/17 13:17:30 george Exp $
 #
 # Authors: George Shapovalov <george@gentoo.org>
 #          Steve Arnold <nerdboy@gentoo.org>
@@ -309,6 +309,7 @@ gnatbuild_pkg_postinst() {
 	elog
 	. ${GnatCommon} || die "failed to source common code"
 	if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then
+		mkdir -p ${SETTINGSDIR}
 		echo "${gnat_profile}" > ${PRIMELIST}
 		elog "The list of primary compilers was empty and got assigned ${gnat_profile}."
 	fi
diff --git a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild b/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
index 6d83043e1767..26b8e8cb81ba 100644
--- a/mail-filter/opendmarc/opendmarc-1.1.3.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.1.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/mail-filter/opendmarc/opendmarc-1.1.3.ebuild,v 1.13 2014/10/05 15:06:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendmarc/opendmarc-1.1.3.ebuild,v 1.14 2014/10/17 13:38:44 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-perl/DBI
diff --git a/mail-mta/exim/exim-4.84.ebuild b/mail-mta/exim/exim-4.84.ebuild
index 9b6c96cb43d8..344b4c5c16a5 100644
--- a/mail-mta/exim/exim-4.84.ebuild
+++ b/mail-mta/exim/exim-4.84.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-mta/exim/exim-4.84.ebuild,v 1.9 2014/10/09 19:51:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.84.ebuild,v 1.10 2014/10/17 13:38:36 ago Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 1b291530809a..fff1d968bacf 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,3 +1,4 @@
 DIST libmikmod-3.2.0.tar.gz 873258 SHA256 734c8490bbf9b0c587920b92414dcfa3c2267838a0cdf698d5f1fb6bba8f661e SHA512 1f48adb4e1540bb9d2ea90c2f1fd1fb2fc494ae2dd0a6bceb20a8f7f7101f37f8c967b0ce36d5e09943d3afe9319f533867d80e5b5552439d300691bee70e33d WHIRLPOOL f7a7aed29026c66abb9e0f2bfb5d703ad5a0cab7bc0454bf5e612ed995808a2d02361eda33c7bbe0e7aaef6aa9ba5f1ed0d6eaf2853a2d6b497c6359043804c3
 DIST libmikmod-3.3.5.tar.gz 1288856 SHA256 b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6 SHA512 ded555754dcc582a112386ad80c11a29c77d696a184a593964449a6c2c024da5d4cc59133a20d0e0e18a6fbad710a5d8ff567527654c91dff06e070749442aab WHIRLPOOL 30a72a0239257b511d1c2805b5812a57ec271263bbd306e327583a1ac0c8f83b31cdf0ff39846ddd72b650ad122ded2ea741dfdb16f6d43979a49f3c5fe2844e
 DIST libmikmod-3.3.6.tar.gz 1288510 SHA256 3f363e03f7b1db75b9b6602841bbd440ed275a548e53545f980df8155de4d330 SHA512 708008d162bac1a17b090a3a56e3078bb3ce42cb0d54b1e57963881d060198e841654ec7a72212aa9dc0e5c8bd95ec1c41ddd58e2db8c6e91a29d22d7bf363a0 WHIRLPOOL 42c0a1f88620fffc4099f87ed04fc5ad1d308bce86e2df085365a3d2624d801cf27dc3c28ec054ab7c4763af4af09d16c9f44e848b4ee23b7efd09ebfa4268d0
+DIST libmikmod-3.3.7.tar.gz 1226732 SHA256 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 SHA512 3d2db6d0838a957f073f43f81e8ee20d803e5103e71bcbf7bb08f8a7776a77be50958522fc48e3ea9c20ee20a5a60eda8a66cd403f382ebd6c7910c6325dd4e9 WHIRLPOOL 708032fddc2260e52baee07dc00c45ac3dd0936d1c0f3f3b131dd3627fa7e1f0c699ab8184863f6435286ea4e1f83599cac76ce985ebd92a2d15ab7844d83fdf
diff --git a/media-libs/libmikmod/libmikmod-3.3.7.ebuild b/media-libs/libmikmod/libmikmod-3.3.7.ebuild
new file mode 100644
index 000000000000..0ac228066644
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.3.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.3.7.ebuild,v 1.1 2014/10/17 13:08:51 ssuominen Exp $
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="A library to play a wide range of module formats"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads"
+
+REQUIRED_USE="|| ( alsa coreaudio nas openal oss pulseaudio )"
+
+RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[${MULTILIB_USEDEP}] )
+	nas? ( >=media-libs/nas-1.9.4:=[${MULTILIB_USEDEP}] )
+	openal? ( >=media-libs/openal-1.15.1-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-5.0[${MULTILIB_USEDEP}] )
+	!${CATEGORY}/${PN}:2
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	oss? ( virtual/os-headers )"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libmikmod-config
+)
+
+multilib_src_configure() {
+	local mysimd="--disable-simd"
+	if use ppc || use ppc64 || use ppc-macos; then
+		mysimd="$(use_enable altivec simd)"
+	fi
+	if use amd64 || use x86 || use x86-fbsd || use x86-freebsd || use amd64-linux || use x86-linux || use x86-macos; then
+		mysimd="$(use_enable sse2 simd)"
+	fi
+
+	# sdl, sdl2: missing multilib supported ebuilds, temporarily disabled, remember to update REQUIRED_USE
+	ECONF_SOURCE=${S} \
+	econf \
+		$(use_enable alsa) \
+		$(use_enable nas) \
+		$(use_enable pulseaudio) \
+		--disable-sdl \
+		--disable-sdl2 \
+		$(use_enable openal) \
+		$(use_enable oss) \
+		$(use_enable coreaudio osx) \
+		$(use_enable debug) \
+		$(use_enable threads) \
+		$(use_enable static-libs static) \
+		--disable-dl \
+		${mysimd}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	dosym ${PN}$(get_libname 3) /usr/$(get_libdir)/${PN}$(get_libname 2)
+}
+
+multilib_src_install_all() {
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+	prune_libtool_files
+}
diff --git a/media-libs/libpng/libpng-1.6.12.ebuild b/media-libs/libpng/libpng-1.6.12.ebuild
index afa49fbdba06..8773c78f04c3 100644
--- a/media-libs/libpng/libpng-1.6.12.ebuild
+++ b/media-libs/libpng/libpng-1.6.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/media-libs/libpng/libpng-1.6.12.ebuild,v 1.6 2014/08/01 17:14:20 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.6.12.ebuild,v 1.7 2014/10/17 14:55:13 klausman Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index aae5fce6a35b..33dd2a1f38f9 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,3 +1,4 @@
 DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 SHA512 d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d WHIRLPOOL 9ec4ae833e3824683ea5c469d3be4b2248645e47d9df199efb717364cf6f67eaffb1e5747e3e0cb0aa71fd5ec3c270119a187a8f5ef2bf6134427b48640740a9
 DIST phonon-4.7.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
 DIST phonon-4.8.0.tar.xz 321468 SHA256 3bcb2a66c83fc5a4518a49cc96bb8971f155947571050a0e02b6be13c91ed524 SHA512 0dc12a4d479245ba7ffab954c91c78e3c469982e6b8ed5ff9b80150aebab448023ffde68b67a2520ca76af9ce3c0608d250f59275767c092f4e364da8cfe105f WHIRLPOOL 00bdd70549a02d601f173b58038185c4af2de6ae2bf0d89e30e212c711af7a8b7f74704ba99d83889cc3065fbe5f78797c42cf538dd9c7e813aa3208c83b6a8b
+DIST phonon-4.8.1.tar.xz 321652 SHA256 b6ca0126cd5330731875acc1cc0b60f8c9ed7ebc71e1d0210b74bf21658027d1 SHA512 98a69fbc8744b44d1041b0b71e7014fb66fa646176b2b356bc45a59248a4bf08be4f690ed1449db4653513c323e342564efe3d94c29117792158530b4e59cee6 WHIRLPOOL 8f1a269bb89ebaadd7e5b1bfa425e6a008d8f0af56c85d6f16fce4a7bf14d8a94f3ea6634400c72a5e56a1b3835d91da832603553f273e5d11a8e83a3078abfa
diff --git a/media-libs/phonon/phonon-4.8.1.ebuild b/media-libs/phonon/phonon-4.8.1.ebuild
new file mode 100644
index 000000000000..d8e75b0a9136
--- /dev/null
+++ b/media-libs/phonon/phonon-4.8.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.8.1.ebuild,v 1.1 2014/10/17 14:49:38 kensington Exp $
+
+EAPI=5
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+else
+	SCM_ECLASS="git-r3"
+	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
+	KEYWORDS=""
+fi
+
+inherit cmake-utils multibuild ${SCM_ECLASS}
+
+DESCRIPTION="KDE multimedia API"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist"
+
+REQUIRED_USE="
+	|| ( aqua gstreamer vlc )
+	|| ( qt4 qt5 )
+	zeitgeist? ( qt4 )
+"
+
+RDEPEND="
+	!!dev-qt/qtphonon:4
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		designer? ( dev-qt/designer:4 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		designer? ( dev-qt/designer:5 )
+	)
+	pulseaudio? (
+		dev-libs/glib:2
+		>=media-sound/pulseaudio-0.9.21[glib]
+	)
+	zeitgeist? ( dev-libs/libqzeitgeist )
+"
+DEPEND="${RDEPEND}
+	qt4? ( >=dev-util/automoc-0.9.87 )
+	virtual/pkgconfig
+"
+PDEPEND="
+	aqua? ( media-libs/phonon-qt7 )
+	gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] )
+	vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-plugin-install.patch" )
+
+pkg_setup() {
+	MULTIBUILD_VARIANTS=()
+	if use qt4; then
+		MULTIBUILD_VARIANTS+=(qt4)
+	fi
+	if use qt5; then
+		MULTIBUILD_VARIANTS+=(qt5)
+	fi
+}
+
+src_configure() {
+	myconfigure() {
+		local mycmakeargs=(
+			-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
+			$(cmake-utils_use designer PHONON_BUILD_DESIGNER_PLUGIN)
+			$(cmake-utils_use_with pulseaudio GLIB2)
+			$(cmake-utils_use_with pulseaudio PulseAudio)
+			$(cmake-utils_use_with zeitgeist QZeitgeist)
+		)
+		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=OFF)
+		fi
+		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
+			mycmakeargs+=(-DPHONON_BUILD_PHONON4QT5=ON)
+		fi
+		cmake-utils_src_configure
+	}
+
+	multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+	multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_install() {
+	multibuild_foreach_variant cmake-utils_src_install
+}
+
+src_test() {
+	multibuild_foreach_variant cmake-utils_src_test
+}
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 8eb6a07daf2a..99bc8d56d7a8 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,2 +1,2 @@
-DIST mikmod-3.2.2.tar.gz 262918 SHA256 e8566651bf49bf0062c1e2e82b682952824c7998cce0bb2e47a840e567a0bb80 SHA512 73528528beb6c5adddb28a301046d855a05bb351915f239570813798f8761fd509e30c2b8a433394aeb367f5d745f767ff51712f9f9dc65351020224a40211ef WHIRLPOOL 121530df2b94f82b9cbcaa11172e0d9f51492e5892116bfbd8bf23d2d150fa2d55e61233167c6d5da4539cbc636ad905f251c05c0a6702ef4e65d301e9319f4e
 DIST mikmod-3.2.5.tar.gz 285801 SHA256 da2b4b13f769a7c54119869851c8e6b9a6ca812b96fe5e2c5394441722e4e383 SHA512 e441d5dc4a3f6f2101e4db8cd3cb55f90a418d92767c143c1754c8ef33445aa4ace48a48ab8c209336c0eb3fd66590380cfbbe71c086908dfb0ae9fdd88adca5 WHIRLPOOL 9f46690799f4f1a899eaff15367512969f461ae6264024e1b1350b59fed979bac42ffcce9569558675a8f257c7de22ded1d0df9f30e4ebbe03fd109c81e8f334
+DIST mikmod-3.2.6.tar.gz 278754 SHA256 04544e0edb36a19fab61233dff97430969cff378a98f5989a1378320550e2673 SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5 WHIRLPOOL aa66da48f4e00e5f823ae512d3005dc4c80693d2b768a43f4ca40fbaecee71cc048f3ad9d136b3df2a78f79545bec34641b85b3fd1690ab65f09068228babec8
diff --git a/media-sound/mikmod/mikmod-3.2.2.ebuild b/media-sound/mikmod/mikmod-3.2.6.ebuild
similarity index 52%
rename from media-sound/mikmod/mikmod-3.2.2.ebuild
rename to media-sound/mikmod/mikmod-3.2.6.ebuild
index 5ff7553eae29..a6e011b2b194 100644
--- a/media-sound/mikmod/mikmod-3.2.2.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.6.ebuild
@@ -1,19 +1,19 @@
-# 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/media-sound/mikmod/mikmod-3.2.2.ebuild,v 1.7 2012/12/30 15:08:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mikmod/mikmod-3.2.6.ebuild,v 1.1 2014/10/17 13:13:26 ssuominen Exp $
 
 EAPI=5
 
 DESCRIPTION="A console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.shlomifish.org/"
-SRC_URI="http://mikmod.shlomifish.org/files/${P}.tar.gz"
+HOMEPAGE="http://mikmod.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libmikmod-3.2.0
+RDEPEND=">=media-libs/libmikmod-3.3
 	>=sys-libs/ncurses-5.7-r7"
 DEPEND="${RDEPEND}"
 
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index cebe5729c932..51d7dd340314 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.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-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.14 2014/09/01 16:47:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.2_pre20130729.ebuild,v 1.15 2014/10/17 14:35:40 klausman Exp $
 
 EAPI=5
 
@@ -157,9 +157,9 @@ DEPEND="${RDEPEND}
 SLOT="0"
 LICENSE="GPL-2"
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 else
-	KEYWORDS="hppa"
+	KEYWORDS="alpha hppa"
 fi
 
 # faac codecs are nonfree
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index cff581373c6a..65436319d9b6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Oct 2014 12:07:02 +0000
+Fri, 17 Oct 2014 16:37:03 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index cff581373c6a..65436319d9b6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Oct 2014 12:07:02 +0000
+Fri, 17 Oct 2014 16:37:03 +0000
diff --git a/metadata/md5-cache/app-admin/denyhosts-2.6-r10 b/metadata/md5-cache/app-admin/denyhosts-2.6-r10
index d9a8b9e61e6c..420865e6f7f6 100644
--- a/metadata/md5-cache/app-admin/denyhosts-2.6-r10
+++ b/metadata/md5-cache/app-admin/denyhosts-2.6-r10
@@ -4,11 +4,11 @@ DESCRIPTION=DenyHosts is a utility to help sys admins thwart ssh hackers
 EAPI=5
 HOMEPAGE=http://www.denyhosts.net
 IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ppc ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=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://sourceforge/denyhosts/DenyHosts-2.6.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=f4ceba0b5c095e7406c794a707fc9325
+_md5_=7664a421783c2e6496ccf23cc76f696a
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5.1 b/metadata/md5-cache/app-admin/sysklogd-1.5.1
index 3988ba455df8..fe2e5bd6007d 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5.1
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5.1
@@ -3,11 +3,11 @@ DESCRIPTION=Standard log daemons
 EAPI=4
 HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
 IUSE=logrotate
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=a17ffefdf77d5eba255423edb1b05c30
+_md5_=91684eb0e95f85e4b29fd0a03f82b9a8
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.3.91 b/metadata/md5-cache/app-editors/emacs-vcs-24.3.91
deleted file mode 100644
index 7d10d6b23903..000000000000
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.3.91
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr sys-apps/paxctl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
-REQUIRED_USE=?? ( aqua X )
-SLOT=24
-SRC_URI=http://dev.gentoo.org/~ulm/distfiles/emacs-24.3.91.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-24.3.91.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=e60cf34697c14696ebc943e798cb328c
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.4.50_pre20140630 b/metadata/md5-cache/app-editors/emacs-vcs-24.4.50_pre20140630
deleted file mode 100644
index 98ef1bebd7c7..000000000000
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.4.50_pre20140630
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) ) virtual/pkgconfig gzip-el? ( app-arch/gzip ) pax_kernel? ( sys-apps/attr sys-apps/paxctl ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
-DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
-EAPI=5
-HOMEPAGE=http://www.gnu.org/software/emacs/
-IUSE=acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib
-LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
-RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] net-libs/liblockfile acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) gfile? ( >=dev-libs/glib-2.28.6 ) gnutls? ( net-libs/gnutls ) gpm? ( sys-libs/gpm ) hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) zlib? ( sys-libs/zlib ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) ) ) ) )
-REQUIRED_USE=?? ( aqua X )
-SLOT=24
-SRC_URI=http://dev.gentoo.org/~ulm/distfiles/emacs-24.4.50_pre20140630.tar.xz mirror://gnu-alpha/emacs/pretest/emacs-24.4.50_pre20140630.tar.xz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=2ec4df68629c269e171ca105aeae0b33
diff --git a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999-r1 b/metadata/md5-cache/app-editors/emacs-vcs-24.4.9999-r1
similarity index 98%
rename from metadata/md5-cache/app-editors/emacs-vcs-24.3.9999-r1
rename to metadata/md5-cache/app-editors/emacs-vcs-24.4.9999-r1
index 5e4bc9af70a2..d6c0f6e70102 100644
--- a/metadata/md5-cache/app-editors/emacs-vcs-24.3.9999-r1
+++ b/metadata/md5-cache/app-editors/emacs-vcs-24.4.9999-r1
@@ -9,4 +9,4 @@ RDEPEND=sys-libs/ncurses >=app-admin/eselect-emacs-1.16 >=app-emacs/emacs-common
 REQUIRED_USE=?? ( aqua X )
 SLOT=24
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	bzr	8b59c16d7183cb93649d7abe70dc4c85	elisp-common	1aa23b3de5dae55456fa2071428eb5bf	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=46774b843d061b019d0ac090a229d973
+_md5_=e6166809b5e6038d9704f8135f8b7488
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6 b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
index 708a43a063e7..c1e2df3c580e 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
+++ b/metadata/md5-cache/dev-ada/asis-gcc-3.4.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-3.4.6* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-3.4.4.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c5229d1112f3495651dd5ad79e38e28
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
index 22a9c9650188..3ffcbe6fc42f 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.1.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e27f596e25a6ff90462dd6305fa055f7
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
index ac4627121139..b8ecaf053e0f 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.1.2-r1
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.1.2* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.1.2.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7da6c62a41876eb54af493339c3c74c
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2 b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
index ef70df7a48a5..f312e0afde87 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.2.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.2* app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.2.2.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=689cd057939e8ec309f0a1407c5aa6e4
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
index 77965d9b37c5..b458648289d4 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.0_pre132166
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gcc-4.3.0_pre132166.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ff1f7a1891f0b9e16f6731db260f3c2
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
index 5a125a7d14e0..0edf9288570d 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e607fdfea21658966330c42fe5d9a16
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1 b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
index d51d89f28b6b..260462206025 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.3.1-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.3* app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2009-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae36b8f30473544b48c0ea59ba9037a1
diff --git a/metadata/md5-cache/dev-ada/asis-gcc-4.4 b/metadata/md5-cache/dev-ada/asis-gcc-4.4
index c62c9c9f8d64..fe4cde7132f1 100644
--- a/metadata/md5-cache/dev-ada/asis-gcc-4.4
+++ b/metadata/md5-cache/dev-ada/asis-gcc-4.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gcc-4.4* app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=http://dev.gentoo.org/~george/src/asis-gpl-2010-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79622b0f4042a2a6be635e492d6b6291
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006 b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
index a838334fc7c7..54629728c6ab 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
+++ b/metadata/md5-cache/dev-ada/asis-gpl-3.4.6.2006
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-3.4.6.2006* app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=mirror://gentoo/asis-gpl-2006.tar.bz2
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=380916ced9aa66c9b3212f10dfbdc300
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
index 9a84b4662202..8a4a36082077 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=867686959b036c56c3652aaf97898ddf
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
index 071ce2a8f6fc..e9d79a6370fb 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2007-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2007* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2007-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74d481b58944b06f82f1aef6fdbcba7a
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
index f5fb293d0e36..4f9972f218e6 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6fbf1adef8635b80411226c653fbecd8
diff --git a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1 b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
index d1078c328613..fc7ff5c4f356 100644
--- a/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
+++ b/metadata/md5-cache/dev-ada/asis-gpl-4.1.3.2008-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND==dev-lang/gnat-gpl-4.1.3.2008* app-admin/eselect-gnat
 SLOT=4.1-2008
 SRC_URI=mirror://gentoo/asis-gpl-2008-src.tgz
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3295ac590ebf6f455fe8018564bf6676
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.40 b/metadata/md5-cache/dev-db/mariadb-5.5.40-r1
similarity index 85%
rename from metadata/md5-cache/dev-db/mariadb-5.5.40
rename to metadata/md5-cache/dev-db/mariadb-5.5.40-r1
index 328230a017b1..57ffc69f57b3 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.40
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.40-r1
@@ -4,12 +4,12 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
 EAPI=5
 HOMEPAGE=http://mariadb.org/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam tokudb jemalloc tcmalloc systemtap
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql ) perl? ( virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes )
 REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster !extraengine !embedded ) static? ( !ssl )
 SLOT=0
-SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.40/source/mariadb-5.5.40.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz mirror://gentoo/mysql-extras-20141009-1450Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20141009-1450Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141009-1450Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141009-1450Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141009-1450Z.tar.bz2
+SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.40/source/mariadb-5.5.40.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.40/kvm-tarbake-jaunty-x86/mariadb-5.5.40.tar.gz mirror://gentoo/mysql-extras-20141017-1419Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20141017-1419Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141017-1419Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141017-1419Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141017-1419Z.tar.bz2
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	1f6618e5b3ea74dec99af103829e6199	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ae4e872b4476853b7b3179fe694186b4
+_md5_=6b9927839896991df2598abb5ab7023f
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.40 b/metadata/md5-cache/dev-db/mysql-5.5.40
index 6127c7cb4346..14f9ac220af2 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.40
+++ b/metadata/md5-cache/dev-db/mysql-5.5.40
@@ -4,7 +4,7 @@ DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=5
 HOMEPAGE=http://www.mysql.com/
 IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.5
 RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
@@ -12,4 +12,4 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.40.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.40.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.40.tar.gz mirror://gentoo/mysql-extras-20140801-1950Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20140801-1950Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20140801-1950Z.tar.bz2
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	mysql-cmake	1f6618e5b3ea74dec99af103829e6199	mysql-v2	99a4b41fb9b05d534873b1d68bc0816e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6a1f5843281788b2ba4b8ccd36aeef05
+_md5_=f7ef1b1f44bd101084b7ca695dfeef29
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6 b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
index 4f2582b098c1..a433998bc294 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-3.4.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-ada-3.4.6.tar.bz2 ppc? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-ppc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-i386.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e6ed07936a412f53ea914fdfe3899b8
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2 b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
index b08da525acf3..2368887bd353 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.1.2
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-core-4.1.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.1.2/gcc-ada-4.1.2.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab3e832a7916ce58d06d2351ab1801d2
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
index 7483b2945bca..1544b4645612 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.2.3
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=app-admin/eselect-gnat
 SLOT=4.2
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-core-4.2.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.3/gcc-ada-4.2.3.tar.bz2 ppc? ( mirror://gentoo/gnatboot-4.1-ppc.tar.bz2 ) x86? ( mirror://gentoo/gnatboot-4.1-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a259448f05c628e3c0dbaff18e98777c
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
index 86f57aa67dfd..965f4d72cd97 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.5
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 <sys-apps/texinfo-5.1 >=dev-libs/gmp-4.2.2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-core-4.3.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.5/gcc-ada-4.3.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=016ff51f4bf943cfe7eebb754d97efb6
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6 b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
index 66d6914d2659..d23816365c43 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.3.6
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.3
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-core-4.3.6.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.6/gcc-ada-4.3.6.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8798b75977c04c70986880ae6a2913f
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
index f7851805a9b6..42feddbd0c5e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.3
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-2.3.1 >=dev-libs/gmp-4.2.2 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-core-4.4.3.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.3/gcc-ada-4.4.3.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.3-i686.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5245aa259ff4f0c173586b2b4eb2593
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
index d562d0166131..4f5249ee1558 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.5
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-core-4.4.5.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.5/gcc-ada-4.4.5.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=afc552026e583e2684283d4770166c45
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7 b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
index 6a7638e252e3..de43d1eae731 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.4.7
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.7/gcc-core-4.4.7.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.4.7/gcc-ada-4.4.7.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cc0b9cfeeabff3127f2e9d20fa3da67
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4 b/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
index 212810c8cd15..0d2f0b126685 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.5.4
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.0.1 >=dev-libs/gmp-5.0 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.5
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/gcc-core-4.5.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/gcc-ada-4.5.4.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=364baa0313dfa6b4cad0f32c2ac7dc02
diff --git a/metadata/md5-cache/dev-lang/gnat-gcc-4.6.4 b/metadata/md5-cache/dev-lang/gnat-gcc-4.6.4
index 015779507c5c..c8207948094c 100644
--- a/metadata/md5-cache/dev-lang/gnat-gcc-4.6.4
+++ b/metadata/md5-cache/dev-lang/gnat-gcc-4.6.4
@@ -8,5 +8,5 @@ LICENSE=GMGPL
 RDEPEND=>=dev-libs/mpfr-3.1.2 >=dev-libs/gmp-5.1.3 >=dev-libs/mpc-1.0.1 >=sys-libs/zlib-1.2 >=sys-libs/ncurses-5.7 app-admin/eselect-gnat
 SLOT=4.6
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.6.4/gcc-core-4.6.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.6.4/gcc-ada-4.6.4.tar.bz2 amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-amd64.tar.bz2 ) sparc? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-sparc.tar.bz2 ) x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.4-i686.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3a84fa9ed021ba65e01006871fa29c77
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
index 4fe2531bf928..e44f3a03740e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.5.2005
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.5/gcc-core-3.4.5.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.5.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07d2be1f7a611c199a2d10e48661480d
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
index 987cd66d79ce..5d6412b01f93 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-3.4.6.2006-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/eselect-gnat
 SLOT=3.4
 SRC_URI=ftp://gcc.gnu.org/pub/gcc/releases/gcc-3.4.6/gcc-core-3.4.6.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip mirror://gentoo/gnat-gpl-3.4.6.1-src.tar.bz2 mirror://gentoo/gnat-gpl-gcc-3.4.6.1.diff.bz2 x86? ( mirror://gentoo/gnatboot-3.4-i386.tar.bz2 ) ppc? ( mirror://gentoo/gnatboot-3.4-ppc.tar.bz2 ) amd64? ( mirror://gentoo/gnatboot-3.4-amd64-r2.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e57bf5568e12cf472f0206ff9055cbda
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
index 08cfab51ab09..5dfbf2a9f5dc 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2007
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/gcc-branch-4.1.3.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip http://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2007.tar.bz2 x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c69c09a6f9d0f9d7bb769bf83b62bdda
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2 b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
index 7df230179eb3..f5e4d0993060 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-4.1.3.2008-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=virtual/blas virtual/lapack app-admin/eselect-gnat
 SLOT=4.1
 SRC_URI=http://dev.gentoo.org/~george/src/gnat-gpl-4.1.3.2008.tar.bz2 http://www.adaic.org/standards/05rm/RM-05-Html.zip x86? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-i386.tar.bz2 ) ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 ) amd64? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-amd64.tar.bz2 )
-_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	6009813361f8cdfc48d785a6a8185cea	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnatbuild	f80d3d1267179b50bd563e8d890c9169	gnuconfig	ee02e61d6c68cee478e2e69214b7caef	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd4c1d1df84240ec4bac71c3b50f7828
diff --git a/metadata/md5-cache/dev-lang/perl-5.18.2-r2 b/metadata/md5-cache/dev-lang/perl-5.18.2-r2
index 685eb1893f7d..1cb204c39c63 100644
--- a/metadata/md5-cache/dev-lang/perl-5.18.2-r2
+++ b/metadata/md5-cache/dev-lang/perl-5.18.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Larry Wall's Practical Extraction and Report Language
 EAPI=5
 HOMEPAGE=http://www.perl.org/
 IUSE=berkdb debug doc gdbm ithreads
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 PDEPEND=>=app-admin/perl-cleaner-2.5 >=virtual/perl-File-Temp-0.230.0 !=perl-core/File-Temp-0.230.400
 RDEPEND=berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) app-arch/bzip2 sys-libs/zlib
 SLOT=0/5.18
 SRC_URI=mirror://cpan/src/5.0/perl-5.18.2.tar.bz2 mirror://cpan/authors/id/R/RJ/RJBS/perl-5.18.2.tar.bz2 mirror://gentoo/perl-5.18.2-patches-2.tar.bz2 http://dev.gentoo.org/~civil/distfiles/dev-lang/perl/perl-5.18.2-patches-2.tar.bz2
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=5d0ea231c08da2a397023fc703a24bf6
+_md5_=09dee4d7b59d09568f445b4a4779f61f
diff --git a/metadata/md5-cache/dev-lang/php-5.4.33 b/metadata/md5-cache/dev-lang/php-5.4.34
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-5.4.33
rename to metadata/md5-cache/dev-lang/php-5.4.34
index 85fd44a23e59..ba00b558be0d 100644
--- a/metadata/md5-cache/dev-lang/php-5.4.33
+++ b/metadata/md5-cache/dev-lang/php-5.4.34
@@ -9,6 +9,6 @@ LICENSE=PHP-3
 RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) mysqlnd? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.4
-SRC_URI=http://www.php.net/distributions/php-5.4.33.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
+SRC_URI=http://www.php.net/distributions/php-5.4.34.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-r2.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=550d1facd05bc5a55968cc313eda26d3
+_md5_=e48d41d7af8bb437ca1e6d86a45a35c3
diff --git a/metadata/md5-cache/dev-lang/php-5.5.17 b/metadata/md5-cache/dev-lang/php-5.5.18
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-5.5.17
rename to metadata/md5-cache/dev-lang/php-5.5.18
index e726cd2d1faa..43d03c00e806 100644
--- a/metadata/md5-cache/dev-lang/php-5.5.17
+++ b/metadata/md5-cache/dev-lang/php-5.5.18
@@ -9,6 +9,6 @@ LICENSE=PHP-3
 RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.5
-SRC_URI=http://www.php.net/distributions/php-5.5.17.tar.bz2
+SRC_URI=http://www.php.net/distributions/php-5.5.18.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7ab025eb6c26ef16ce1c4929a7ea41b6
+_md5_=ab4828ae8e7cf8863f4cb3eef40bcda3
diff --git a/metadata/md5-cache/dev-lang/php-5.6.1 b/metadata/md5-cache/dev-lang/php-5.6.1
deleted file mode 100644
index 8660b28d01ee..000000000000
--- a/metadata/md5-cache/dev-lang/php-5.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) !<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.69 sys-devel/libtool virtual/pkgconfig
-DESCRIPTION=The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs
-EAPI=5
-HOMEPAGE=http://php.net/
-IUSE=embed +cli cgi fpm apache2 threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash mssql mysql libmysqlclient mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib apache2
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=PHP-3
-RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
-REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
-SLOT=5.6
-SRC_URI=http://www.php.net/distributions/php-5.6.1.tar.bz2
-_eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=21013188fb164f9bc710afcbf88802bc
diff --git a/metadata/md5-cache/dev-lang/php-5.6.0 b/metadata/md5-cache/dev-lang/php-5.6.2
similarity index 98%
rename from metadata/md5-cache/dev-lang/php-5.6.0
rename to metadata/md5-cache/dev-lang/php-5.6.2
index a23628541029..6ed3fe08f096 100644
--- a/metadata/md5-cache/dev-lang/php-5.6.0
+++ b/metadata/md5-cache/dev-lang/php-5.6.2
@@ -9,6 +9,6 @@ LICENSE=PHP-3
 RDEPEND=>=app-admin/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] <www-servers/apache-2.4[threads=] ) ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) libmysqlclient? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) vpx? ( media-libs/libvpx ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) apache2? ( =www-servers/apache-2* )
 REQUIRED_USE=truetype? ( gd ) vpx? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) libmysqlclient? ( || ( mysql mysqli pdo ) ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysql !mysqli ) sharedmem? ( !threads ) !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )
 SLOT=5.6
-SRC_URI=http://www.php.net/distributions/php-5.6.0.tar.bz2
+SRC_URI=http://www.php.net/distributions/php-5.6.2.tar.bz2
 _eclasses_=apache-module	5c4c90da2d68c2dc8391666824f1293c	autotools	ebea507d219855923e3438c953cf4ab8	db-use	82d0e62839f20e1e0d5a2259abd5316f	depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3c097f3a4010a363ab03a65dacfc9c0c
+_md5_=9f1239e6be7980b051532fe8681feaf8
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.6 b/metadata/md5-cache/dev-libs/fribidi-0.19.6
index c7a47a2706e6..bad5e4d6640e 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.6
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.6
@@ -4,11 +4,11 @@ DESCRIPTION=A free implementation of the unicode bidirectional algorithm
 EAPI=5
 HOMEPAGE=http://fribidi.org/
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fribidi.org/download/fribidi-0.19.6.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=cce1b6a317db9b0c152a3951328fc83b
+_md5_=0cffc46cce68a07e1ababe88851378da
diff --git a/metadata/md5-cache/dev-libs/hiredis-0.11.0-r1 b/metadata/md5-cache/dev-libs/hiredis-0.11.0-r1
index a379e6b33bce..5d5c53c5eea6 100644
--- a/metadata/md5-cache/dev-libs/hiredis-0.11.0-r1
+++ b/metadata/md5-cache/dev-libs/hiredis-0.11.0-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Minimalistic C client library for the Redis database
 EAPI=4
 HOMEPAGE=http://github.com/redis/hiredis
 IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm hppa ppc x86 ~x86-fbsd ~x64-solaris
+KEYWORDS=alpha amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~x64-solaris
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/redis/hiredis/archive/v0.11.0.tar.gz -> hiredis-0.11.0.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=547add6992f07096cfc1de12908ec6e0
+_md5_=18cbf810053cb0ce4709502b3116c410
diff --git a/metadata/md5-cache/dev-libs/newt-0.52.15 b/metadata/md5-cache/dev-libs/newt-0.52.15
index 8d5271966125..882ad8c81254 100644
--- a/metadata/md5-cache/dev-libs/newt-0.52.15
+++ b/metadata/md5-cache/dev-libs/newt-0.52.15
@@ -4,11 +4,11 @@ DESCRIPTION=Redhat's Newt windowing toolkit development files
 EAPI=5
 HOMEPAGE=https://fedorahosted.org/newt/
 IUSE=gpm tcl nls python_targets_python2_7
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=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(-)] >=dev-libs/popt-1.6 =sys-libs/slang-2* elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( >=dev-lang/tcl-8.5 )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/n/e/newt/newt-0.52.15.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=aee16ab159e62fbf75fd0e0a22b74173
+_md5_=49e1be1e766fda40dd2909e78b9ecf88
diff --git a/metadata/md5-cache/dev-libs/nss-3.16.5 b/metadata/md5-cache/dev-libs/nss-3.16.5
index 56988415e08c..b8d7e0f15b83 100644
--- a/metadata/md5-cache/dev-libs/nss-3.16.5
+++ b/metadata/md5-cache/dev-libs/nss-3.16.5
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
 EAPI=5
 HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
 IUSE=+cacert +nss-pem utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_5_RTM/src/nss-3.16.5.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 )
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=10ea09587488dc2373351058d03fbd32
+_md5_=81fd09e200b96a1450c1444e6aae948c
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1j b/metadata/md5-cache/dev-libs/openssl-1.0.1j
index 64676ebd0b36..97a66c17d9c8 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1j
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1j
@@ -4,11 +4,11 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=4
 HOMEPAGE=http://www.openssl.org/
 IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<net-misc/openssh-5.9_p1-r4 !<net-libs/neon-0.29.6-r1
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1j.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=35c40d6a4a1ade377bf69aaae9b2405e
+_md5_=164f411c3f5b9fe99057dcff7839903d
diff --git a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r3 b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
similarity index 67%
rename from metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r3
rename to metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
index 4d352de235ed..fb335987b7b9 100644
--- a/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r3
+++ b/metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=perl? ( dev-lang/perl:= ) !<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.69 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
+DEPEND=perl? ( dev-lang/perl:= ) !<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.69 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
 DESCRIPTION=An ISO-C:1999 API and corresponding CLI for the generation of DCE 1.1, ISO/IEC 11578:1996 and RFC 4122 compliant UUID
 EAPI=5
 HOMEPAGE=http://www.ossp.org/pkg/lib/uuid/
-IUSE=+cxx perl php static-libs php_targets_php5-3 php_targets_php5-4 php_targets_php5-5
+IUSE=+cxx perl php static-libs php_targets_php5-5 php_targets_php5-4
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=ISC
-RDEPEND=perl? ( dev-lang/perl:= ) php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 ) )
-REQUIRED_USE=php? ( || ( php_targets_php5-3 php_targets_php5-4 php_targets_php5-5 ) )
+RDEPEND=perl? ( dev-lang/perl:= ) php? ( php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+REQUIRED_USE=php? ( || ( php_targets_php5-5 php_targets_php5-4 ) )
 SLOT=0
 SRC_URI=ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	f889e8437ffc64d766053d029c422c4e	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=3c47216bf0af389c8ff5e093f395e45b
+_md5_=2c31403352d79de66557462f5e290dfe
diff --git a/metadata/md5-cache/dev-perl/Switch-2.160.0-r1 b/metadata/md5-cache/dev-perl/Switch-2.160.0-r1
index c2650669e1b7..36f913372fcf 100644
--- a/metadata/md5-cache/dev-perl/Switch-2.160.0-r1
+++ b/metadata/md5-cache/dev-perl/Switch-2.160.0-r1
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=A switch statement for Perl
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Switch/
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RG/RGARCIA/Switch-2.16.tar.gz http://dev.gentoo.org/~tove/distfiles/perl-core/Switch/Switch-2.16-rt60380.patch
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	f889e8437ffc64d766053d029c422c4e	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=474349dc7da569c601ab5d34706e8547
+_md5_=4cfd2fc82f37f27c189e4145a04eb455
diff --git a/metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r1 b/metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r2
similarity index 63%
rename from metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r1
rename to metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r2
index 18281313a628..e8dd123b651c 100644
--- a/metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r1
+++ b/metadata/md5-cache/dev-php/pecl-uuid-1.0.3-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-apps/util-linux !<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.69 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
+DEPEND=sys-apps/util-linux !<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.69 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 DESCRIPTION=A wrapper around libuuid
 EAPI=5
 HOMEPAGE=http://pecl.php.net/uuid
-IUSE=php_targets_php5-3 php_targets_php5-4 php_targets_php5-5
+IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
-RDEPEND=sys-apps/util-linux php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-5? ( dev-lang/php:5.5 )
-REQUIRED_USE=|| ( php_targets_php5-3 php_targets_php5-4 php_targets_php5-5 )
+RDEPEND=sys-apps/util-linux php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php5-5? ( dev-lang/php:5.5 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php5-5 php_targets_php5-4 )
 SLOT=0
 SRC_URI=http://pecl.php.net/get/uuid-1.0.3.tgz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	39437168059a2166e012420b3ba12815	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=c1351a0661a5a214e765e4e1870579d9
+_md5_=0a7027acd1196f7444a71288117f384a
diff --git a/metadata/md5-cache/dev-python/dpkt-1.8-r1 b/metadata/md5-cache/dev-python/dpkt-1.8-r1
new file mode 100644
index 000000000000..87ce46296443
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dpkt-1.8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols
+EAPI=5
+HOMEPAGE=http://code.google.com/p/dpkt/
+IUSE=examples python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=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=http://dpkt.googlecode.com/files/dpkt-1.8.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=72d2efdefdb0c48f96f5a024fdf38b5a
diff --git a/metadata/md5-cache/dev-python/falcon-0.1.8 b/metadata/md5-cache/dev-python/falcon-0.1.8
new file mode 100644
index 000000000000..2e405599e550
--- /dev/null
+++ b/metadata/md5-cache/dev-python/falcon-0.1.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] test? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/testtools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DESCRIPTION=A supersonic micro-framework for building cloud APIs
+EAPI=5
+HOMEPAGE=http://falconframework.org/ https://pypi.python.org/pypi/falcon
+IUSE=+cython test python_targets_python2_7 python_targets_python3_3 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/mimeparse[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] cython? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_pypy )
+SLOT=0
+SRC_URI=https://github.com/racker/falcon/archive/0.1.8.tar.gz -> falcon-0.1.8.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=c560dd285010e939bd28b1a8dd7b78c5
diff --git a/metadata/md5-cache/dev-python/python-ldap-2.4.18 b/metadata/md5-cache/dev-python/python-ldap-2.4.18
index 9f446bc01ab3..4cda9d5e549a 100644
--- a/metadata/md5-cache/dev-python/python-ldap-2.4.18
+++ b/metadata/md5-cache/dev-python/python-ldap-2.4.18
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] 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(-)]
+DEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) 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(-)]
 DESCRIPTION=Various LDAP-related Python modules
 EAPI=5
 HOMEPAGE=http://www.python-ldap.org http://pypi.python.org/pypi/python-ldap
 IUSE=doc examples sasl ssl python_targets_python2_7 python_targets_pypy
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
 LICENSE=PSF-2
-RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) 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(-)]
+RDEPEND=>net-nds/openldap-2.4.11 dev-python/pyasn1[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] dev-python/pyasn1-modules[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] sasl? ( >=dev-libs/cyrus-sasl-2.1 ) 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(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-ldap/python-ldap-2.4.18.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=19c332f5960d62b77cb8e6b4cedb0f11
+_md5_=1497ff9d8c9a1e1a53a65e0a82bfa4ba
diff --git a/metadata/md5-cache/dev-python/pyxdg-0.25-r1 b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
index 9ee23c8f4710..b999a1bbef4c 100644
--- a/metadata/md5-cache/dev-python/pyxdg-0.25-r1
+++ b/metadata/md5-cache/dev-python/pyxdg-0.25-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python module to deal with freedesktop.org specifications
 EAPI=5
 HOMEPAGE=http://freedesktop.org/wiki/Software/pyxdg http://cgit.freedesktop.org/xdg/pyxdg/
 IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=LGPL-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=http://people.freedesktop.org/~takluyver/pyxdg-0.25.tar.gz
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	75e5c82b55dcb208a0a8f4ab8847e731	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=8184a4c7a89f99f9d971c81148c0f58f
+_md5_=3889b577734689136ef4d8c231704af8
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.1.3 b/metadata/md5-cache/mail-filter/opendmarc-1.1.3
index 0525c3d7b32e..4f2ce9f682d9 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.1.3
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.1.3
@@ -3,9 +3,9 @@ DEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail )
 DESCRIPTION=Open source DMARC implementation
 EAPI=5
 HOMEPAGE=http://www.trusteddomain.org/opendmarc/
-KEYWORDS=alpha amd64 hppa ~ia64 ppc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=dev-perl/DBI || ( mail-filter/libmilter mail-mta/sendmail ) dev-perl/Switch
 SLOT=0
 SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.1.3.tar.gz
-_md5_=7a716c96bef70bd52002e63119d854ef
+_md5_=44ce5d67479be88afe531f45097c7c83
diff --git a/metadata/md5-cache/mail-mta/exim-4.84 b/metadata/md5-cache/mail-mta/exim-4.84
index d124bf66181e..76025214f118 100644
--- a/metadata/md5-cache/mail-mta/exim-4.84
+++ b/metadata/md5-cache/mail-mta/exim-4.84
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
 EAPI=5
 HOMEPAGE=http://www.exim.org/
 IUSE=dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl gnutls ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X
-KEYWORDS=alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/sed-4.0.5 >=sys-libs/db-3.2 dev-libs/libpcre perl? ( dev-lang/perl:= ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls[pkcs11?] dev-libs/libtasn1 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) selinux? ( sec-policy/selinux-exim ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/radiusclient ) virtual/libiconv !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !<mail-mta/msmtp-1.4.19-r1 !>=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc )
 REQUIRED_USE=spf? ( exiscan-acl ) srs? ( exiscan-acl ) dmarc? ( spf dkim ) pkcs11? ( gnutls )
 SLOT=0
 SRC_URI=ftp://ftp.exim.org/pub/exim/exim4/exim-4.84.tar.bz2 mirror://gentoo/system_filter.exim.gz doc? ( ftp://ftp.exim.org/pub/exim/exim4/exim-html-4.84.tar.bz2 )
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=3c18b064016469e29ff6503087fa59d1
+_md5_=6ce6180dba42584bbb1d06b000408902
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.7 b/metadata/md5-cache/media-libs/libmikmod-3.3.7
new file mode 100644
index 000000000000..5d4d921e224e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) sys-apps/texinfo oss? ( virtual/os-headers )
+DESCRIPTION=A library to play a wide range of module formats
+EAPI=5
+HOMEPAGE=http://mikmod.sourceforge.net/
+IUSE=+alsa altivec coreaudio debug nas openal oss pulseaudio sse2 static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=LGPL-2+ LGPL-2.1
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nas? ( >=media-libs/nas-1.9.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-libs/libmikmod:2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
+REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.7.tar.gz
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=2b9a2ed906847969f7a441c7a50dc016
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.12 b/metadata/md5-cache/media-libs/libpng-1.6.12
index 15ddf113978e..137734af37e4 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.12
+++ b/metadata/md5-cache/media-libs/libpng-1.6.12
@@ -4,10 +4,10 @@ DESCRIPTION=Portable Network Graphics library
 EAPI=5
 HOMEPAGE=http://www.libpng.org/
 IUSE=apng neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=libpng
 RDEPEND=>=sys-libs/zlib-1.2.8-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.12.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.12-apng.patch.gz )
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=61a75c97b09507c8226d840ea72088fc
+_md5_=7aff7fc028bbaab304407c2357e15937
diff --git a/metadata/md5-cache/media-libs/phonon-4.8.1 b/metadata/md5-cache/media-libs/phonon-4.8.1
new file mode 100644
index 000000000000..37f7aae5c3c8
--- /dev/null
+++ b/metadata/md5-cache/media-libs/phonon-4.8.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) zeitgeist? ( dev-libs/libqzeitgeist ) qt4? ( >=dev-util/automoc-0.9.87 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=KDE multimedia API
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon
+IUSE=aqua debug designer gstreamer pulseaudio +qt4 qt5 +vlc zeitgeist
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=LGPL-2.1
+PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( >=media-libs/phonon-gstreamer-4.8.0[qt4?,qt5?] ) vlc? ( >=media-libs/phonon-vlc-0.8.0[qt4?,qt5?] )
+RDEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) zeitgeist? ( dev-libs/libqzeitgeist )
+REQUIRED_USE=|| ( aqua gstreamer vlc ) || ( qt4 qt5 ) zeitgeist? ( qt4 )
+SLOT=0
+SRC_URI=mirror://kde/stable/phonon/4.8.1/phonon-4.8.1.tar.xz
+_eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=9d035f7c5beafbf75583e06de81a2361
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.2 b/metadata/md5-cache/media-sound/mikmod-3.2.2
deleted file mode 100644
index 8cacd224e623..000000000000
--- a/metadata/md5-cache/media-sound/mikmod-3.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libmikmod-3.2.0 >=sys-libs/ncurses-5.7-r7
-DESCRIPTION=A console MOD-Player based on libmikmod
-EAPI=5
-HOMEPAGE=http://mikmod.shlomifish.org/
-KEYWORDS=alpha amd64 ~hppa ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libmikmod-3.2.0 >=sys-libs/ncurses-5.7-r7
-SLOT=0
-SRC_URI=http://mikmod.shlomifish.org/files/mikmod-3.2.2.tar.gz
-_md5_=23f9288e1580fbb3c56213708053d82a
diff --git a/metadata/md5-cache/media-sound/mikmod-3.2.6 b/metadata/md5-cache/media-sound/mikmod-3.2.6
new file mode 100644
index 000000000000..f0f7b85617a6
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mikmod-3.2.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7
+DESCRIPTION=A console MOD-Player based on libmikmod
+EAPI=5
+HOMEPAGE=http://mikmod.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libmikmod-3.3 >=sys-libs/ncurses-5.7-r7
+SLOT=0
+SRC_URI=mirror://sourceforge/mikmod/mikmod-3.2.6.tar.gz
+_md5_=8e09ad86832571bcde4cffaa24e5f208
diff --git a/metadata/md5-cache/media-video/mplayer-1.2_pre20130729 b/metadata/md5-cache/media-video/mplayer-1.2_pre20130729
index 483f30d64394..dd726f38a710 100644
--- a/metadata/md5-cache/media-video/mplayer-1.2_pre20130729
+++ b/metadata/md5-cache/media-video/mplayer-1.2_pre20130729
@@ -4,11 +4,11 @@ DESCRIPTION=Media Player for Linux
 EAPI=5
 HOMEPAGE=http://www.mplayerhq.hu/
 IUSE=3dnow 3dnowext a52 aalib +alsa altivec aqua bidi bindist bl bluray bs2b cddb +cdio cdparanoia cpudetection debug dga directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum +mmx mmxext mng mp3 nas +network nut openal opengl +osdmenu oss png pnm pulseaudio pvr radio rar rtc rtmp samba selinux +shm sdl speex sse sse2 ssse3 tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran video_cards_s3virge video_cards_mga video_cards_tdfx
-KEYWORDS=~alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses app-arch/bzip2 sys-libs/zlib || ( >=media-video/ffmpeg-1.2.1:0 >=media-video/libav-9.8 ) a52? ( media-libs/a52dec ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bidi? ( dev-libs/fribidi ) bluray? ( >=media-libs/libbluray-0.2.1 ) bs2b? ( media-libs/libbs2b ) cdio? ( dev-libs/libcdio ) cdparanoia? ( !cdio? ( media-sound/cdparanoia ) ) dga? ( x11-libs/libXxf86dga ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dv? ( media-libs/libdv ) dvb? ( virtual/linuxtv-dvb-headers ) dvd? ( >=media-libs/libdvdread-4.1.3 ) dvdnav? ( >=media-libs/libdvdnav-4.1.3 ) encode? ( !twolame? ( toolame? ( media-sound/toolame ) ) twolame? ( media-sound/twolame ) faac? ( media-libs/faac ) mp3? ( media-sound/lame ) x264? ( >=media-libs/x264-0.0.20100423:= ) xvid? ( media-libs/xvid ) ) enca? ( app-i18n/enca ) faad? ( media-libs/faad2 ) ggi? ( media-libs/libggi media-libs/libggiwmh ) gif? ( media-libs/giflib ) gsm? ( media-sound/gsm ) iconv? ( virtual/libiconv ) jack? ( media-sound/jack-audio-connection-kit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) ladspa? ( media-libs/ladspa-sdk ) libass? ( >=media-libs/libass-0.9.10:=[enca?] ) libcaca? ( media-libs/libcaca ) libmpeg2? ( media-libs/libmpeg2 ) lirc? ( app-misc/lirc ) live? ( media-plugins/live ) lzo? ( >=dev-libs/lzo-2 ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) mp3? ( media-sound/mpg123 ) nas? ( media-libs/nas ) nut? ( >=media-libs/libnut-661 ) openal? ( media-libs/openal ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) pnm? ( media-libs/netpbm ) pulseaudio? ( media-sound/pulseaudio ) rar? ( || ( app-arch/unrar app-arch/rar ) ) rtmp? ( media-video/rtmpdump ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mplayer ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speex ) theora? ( media-libs/libtheora[encode?] ) tremor? ( media-libs/tremor ) truetype? ( virtual/ttf-fonts media-libs/fontconfig >=media-libs/freetype-2.2.1:2 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( !tremor? ( media-libs/libvorbis ) ) X? ( x11-libs/libXext x11-libs/libXxf86vm ) xanim? ( media-video/xanim ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=bindist? ( !faac ) dga? ( X ) dvdnav? ( dvd ) enca? ( iconv ) ggi? ( X ) libass? ( truetype ) opengl? ( X ) osdmenu? ( X ) truetype? ( iconv ) vdpau? ( X ) vidix? ( X ) xinerama? ( X ) xscreensaver? ( X ) xv? ( X ) xvmc? ( xv )
 SLOT=0
 SRC_URI=mirror://gentoo/mplayer-1.2_pre20130729.tar.xz !truetype? ( mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2 )
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=74b14f91250bde26363f04f6236078fd
+_md5_=02f869f63e0b4fe8f86bf5e4d0bad052
diff --git a/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1 b/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1
index 222e9988f782..fed3afddc35e 100644
--- a/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1
+++ b/metadata/md5-cache/net-analyzer/netperf-2.6.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Network performance benchmark including tests for TCP, UDP, sockets,
 EAPI=5
 HOMEPAGE=http://www.netperf.org/
 IUSE=demo sctp
-KEYWORDS=~alpha amd64 arm64 hppa ~ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 arm64 hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=netperf
 SLOT=0
 SRC_URI=ftp://ftp.netperf.org/netperf/netperf-2.6.0.tar.bz2
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=70d70a5cd80781641f8b719ad0d71e97
+_md5_=bbbec531d8b760b49b545f264eb8a95e
diff --git a/metadata/md5-cache/net-analyzer/traceroute-2.0.20 b/metadata/md5-cache/net-analyzer/traceroute-2.0.20
index 0320add8bc65..e8ad366e5612 100644
--- a/metadata/md5-cache/net-analyzer/traceroute-2.0.20
+++ b/metadata/md5-cache/net-analyzer/traceroute-2.0.20
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to trace the route of IP packets
 EAPI=5
 HOMEPAGE=http://traceroute.sourceforge.net/
 IUSE=static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=!<net-misc/iputils-20121221-r1
 SLOT=0
 SRC_URI=mirror://sourceforge/traceroute/traceroute-2.0.20.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=a0feacb19b4af29c4878eecdca1be1e2
+_md5_=4223c19f8e9c36660cd8cc857d596799
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1 b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
index 51c10a1e2f2f..a9e6fd4039e4 100644
--- a/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
+++ b/metadata/md5-cache/net-libs/libmnl-1.0.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Minimalistic netlink library
 EAPI=4
 HOMEPAGE=http://netfilter.org/projects/libmnl
 IUSE=examples static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux
+KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.netfilter.org/projects/libmnl/files/libmnl-1.0.3.tar.bz2
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=b350ccaa9445fa0e6ab01ff1ff9d6f85
+_md5_=a340ac3b9fa54a3d93e1b386e0c7a0a6
diff --git a/metadata/md5-cache/net-misc/remmina-1.1.1 b/metadata/md5-cache/net-misc/remmina-1.1.1
new file mode 100644
index 000000000000..d912dd3acafe
--- /dev/null
+++ b/metadata/md5-cache/net-misc/remmina-1.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.31.18:2 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile x11-themes/gnome-icon-theme avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt:0 ) freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A GTK+ RDP, VNC, XDMCP and SSH client
+EAPI=4
+HOMEPAGE=http://remmina.sourceforge.net/
+IUSE=ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.31.18:2 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile x11-themes/gnome-icon-theme avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt:0 ) freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
+SLOT=0
+SRC_URI=https://github.com/FreeRDP/Remmina/archive/v1.1.1.tar.gz -> remmina-1.1.1.tar.gz
+_eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=f690cbfb32de30927bd7b68f94e6f770
diff --git a/metadata/md5-cache/net-misc/remmina-9999 b/metadata/md5-cache/net-misc/remmina-9999
index e27fa8c82700..69d092e09e8e 100644
--- a/metadata/md5-cache/net-misc/remmina-9999
+++ b/metadata/md5-cache/net-misc/remmina-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=x11-libs/gtk+:3 >=dev-libs/glib-2.31.18:2 >=net-libs/libvncserver-0.9.8.2 x11-libs/libxkbfile x11-themes/gnome-icon-theme avahi? ( net-dns/avahi[gtk3] ) ayatana? ( dev-libs/libappindicator ) crypt? ( dev-libs/libgcrypt:0 ) freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 ) gnome-keyring? ( gnome-base/libgnome-keyring ) ssh? ( net-libs/libssh[sftp] ) telepathy? ( net-libs/telepathy-glib ) vte? ( x11-libs/vte:2.90 ) !net-misc/remmina-plugins
 SLOT=0
 _eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	git-2	2027b81a576527fa16bece425941e094	git-r3	6ebae45064cb04482f3c702632dd9528	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=d8ce18c683770b3a00ad046577dd2698
+_md5_=66c74df814ccbab2401186846ab671a1
diff --git a/metadata/md5-cache/net-proxy/squid-3.3.13-r1 b/metadata/md5-cache/net-proxy/squid-3.3.13-r1
index 8182215a04e8..597cd1785acc 100644
--- a/metadata/md5-cache/net-proxy/squid-3.3.13-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.3.13-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A full-featured web proxy cache
 EAPI=5
 HOMEPAGE=http://www.squid-cache.org/
 IUSE=caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap icap-client ssl-crtd mysql postgres sqlite qos tproxy pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:0.2 ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 sys-devel/libtool dev-lang/perl sys-devel/libtool samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v3/3.3/squid-3.3.13.tar.xz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c19c9f64ab2b94dc5cf7bae2a95345c5
+_md5_=8ad2636c464f100871f1b370ce7af17e
diff --git a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0 b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
index d9493d9130d9..e9948c36e99f 100644
--- a/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
+++ b/metadata/md5-cache/perl-core/Data-Dumper-2.154.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=Stringified perl data structures, suitable for both printing and eval
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Data-Dumper/
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	f889e8437ffc64d766053d029c422c4e	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2969f008a1fd56fe9ea64298e16dc1b4
+_md5_=1576773b454085e38c815b3c15785d48
diff --git a/metadata/md5-cache/perl-core/File-Temp-0.230.0 b/metadata/md5-cache/perl-core/File-Temp-0.230.0
index 36a1b2cd6dc8..62fa79d307df 100644
--- a/metadata/md5-cache/perl-core/File-Temp-0.230.0
+++ b/metadata/md5-cache/perl-core/File-Temp-0.230.0
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)]
 DESCRIPTION=File::Temp can be used to create and open temporary files in a safe way
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/File-Temp/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
 RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TJ/TJENNESS/File-Temp-0.23.tar.gz
 _eclasses_=alternatives	326031758c86cd08f5844f475f03ac01	eutils	32548a82e42dc26e3312581476d2f20c	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	f889e8437ffc64d766053d029c422c4e	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=34ee42e418ab4191d9c66770a13ce5f3
+_md5_=a727426e0a5f71bdf1a21b04d0a7ab5e
diff --git a/metadata/md5-cache/sci-biology/seqan-1.4.2 b/metadata/md5-cache/sci-biology/seqan-1.4.2
new file mode 100644
index 000000000000..672090361fbc
--- /dev/null
+++ b/metadata/md5-cache/sci-biology/seqan-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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(+)?] sci-biology/samtools sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=C++ Sequence Analysis Library
+EAPI=5
+HOMEPAGE=http://www.seqan.de/
+IUSE=python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD GPL-3
+RDEPEND=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(+)?] sci-biology/samtools
+REQUIRED_USE=python_single_target_python2_7? ( python_targets_python2_7 ) ^^ ( python_single_target_python2_7 )
+SLOT=0
+SRC_URI=http://packages.seqan.de/seqan-src/seqan-src-1.4.2.tar.gz
+_eclasses_=cmake-utils	9b9240b47b8dd08ad95a619ec16c39bd	eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-single-r1	a71a169a881e0a11d04a7fe12dc39f6e	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=e57a75e7635efda5ad597daefa83ba55
diff --git a/metadata/md5-cache/sci-libs/libcerf-1.3 b/metadata/md5-cache/sci-libs/libcerf-1.3
index 59b13539a71c..c5490e6125da 100644
--- a/metadata/md5-cache/sci-libs/libcerf-1.3
+++ b/metadata/md5-cache/sci-libs/libcerf-1.3
@@ -3,9 +3,9 @@ DESCRIPTION=library that provides an efficient and accurate implementation of co
 EAPI=5
 HOMEPAGE=http://apps.jcns.fz-juelich.de/doku/sc/libcerf
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://apps.jcns.fz-juelich.de/src/libcerf/libcerf-1.3.tgz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	32548a82e42dc26e3312581476d2f20c	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=b98b3263a20b72706376c2ce0376a54a
+_md5_=c59f48de956f5057e1e6912d90cefbfb
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1 b/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1
deleted file mode 100644
index 2dacd86ff1a0..000000000000
--- a/metadata/md5-cache/sys-devel/gettext-0.19.2.1_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=GNU locale utilities
-EAPI=4
-HOMEPAGE=http://www.gnu.org/software/gettext/
-IUSE=acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-LICENSE=GPL-3 LGPL-2
-PDEPEND=emacs? ( app-emacs/po-mode )
-RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-SLOT=0
-SRC_URI=mirror://gnu-alpha/gettext/gettext-0.19.2.1-rc1.tar.xz
-_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b86bb74a1533e4dc0cba6cbdf7bb9b9b
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.1 b/metadata/md5-cache/sys-devel/gettext-0.19.3
similarity index 95%
rename from metadata/md5-cache/sys-devel/gettext-0.19.1
rename to metadata/md5-cache/sys-devel/gettext-0.19.3
index 89424c109fba..00e899f9cce3 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.3
@@ -9,6 +9,6 @@ LICENSE=GPL-3 LGPL-2
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
-SRC_URI=mirror://gnu/gettext/gettext-0.19.1.tar.gz
+SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
 _eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=50ec365dcd5fa83b17195bb5d8a5a8e8
+_md5_=ebd5802ca7abd5fbef088ee81b4ca12d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.17.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.17.1-r1
new file mode 100644
index 000000000000..34071e31a46e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.17.1-r1
@@ -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 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 3.17 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.17.1-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.17.tar.xz deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.17.N/deblob-3.17 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.17.N/deblob-check -> deblob-check-3.17 ) mirror://gentoo/genpatches-3.17-3.base.tar.xz mirror://gentoo/genpatches-3.17-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.17-3.experimental.tar.xz )
+_eclasses_=eutils	32548a82e42dc26e3312581476d2f20c	kernel-2	6fb31411472936acc8287129d3df7f43	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=810b2724f5a8f819c3f6a0ca76473fa9
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.10.32 b/metadata/md5-cache/sys-kernel/linux-docs-3.10.58
similarity index 66%
rename from metadata/md5-cache/sys-kernel/linux-docs-3.10.32
rename to metadata/md5-cache/sys-kernel/linux-docs-3.10.58
index 8789cfef80ac..3554e8a2d8bb 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-3.10.32
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.10.58
@@ -4,9 +4,9 @@ DESCRIPTION=Developer documentation generated from the Linux kernel
 EAPI=5
 HOMEPAGE=http://www.kernel.org/
 IUSE=html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.32.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.58.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=6249ea8dd41dca73b49178872749208c
+_md5_=6288a8915f765bc6d00a19ee48a8d359
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.12.16 b/metadata/md5-cache/sys-kernel/linux-docs-3.12.30
similarity index 66%
rename from metadata/md5-cache/sys-kernel/linux-docs-3.12.16
rename to metadata/md5-cache/sys-kernel/linux-docs-3.12.30
index 3f274ca0263d..bf4d8c611e5f 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-3.12.16
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.12.30
@@ -4,9 +4,9 @@ DESCRIPTION=Developer documentation generated from the Linux kernel
 EAPI=5
 HOMEPAGE=http://www.kernel.org/
 IUSE=html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.16.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.30.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=908f5950cc93738b9dbad18b9506f1bf
+_md5_=7e71a3b5a9eb9e096a3528c1e64f26b6
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.14.22 b/metadata/md5-cache/sys-kernel/linux-docs-3.14.22
new file mode 100644
index 000000000000..4fcafdd2e398
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.14.22
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-text/docbook-sgml-utils app-text/xmlto sys-apps/sed ~app-text/docbook-xml-dtd-4.1.2
+DESCRIPTION=Developer documentation generated from the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org/
+IUSE=html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.22.tar.xz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=20319c3571958a426ec794df4d3a58b5
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.13.9 b/metadata/md5-cache/sys-kernel/linux-docs-3.16.6
similarity index 82%
rename from metadata/md5-cache/sys-kernel/linux-docs-3.13.9
rename to metadata/md5-cache/sys-kernel/linux-docs-3.16.6
index f5c54f07f268..ca04b80a0c26 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-3.13.9
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.16.6
@@ -7,6 +7,6 @@ IUSE=html
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.9.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.16.6.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=5f1ce1953b9a3f3a100d7a90ceac2848
+_md5_=60dff22f161a42c13d06d1c83fa0c895
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.2.55 b/metadata/md5-cache/sys-kernel/linux-docs-3.17.1
similarity index 66%
rename from metadata/md5-cache/sys-kernel/linux-docs-3.2.55
rename to metadata/md5-cache/sys-kernel/linux-docs-3.17.1
index 87c6e9e7c34c..4eb6d4a082a0 100644
--- a/metadata/md5-cache/sys-kernel/linux-docs-3.2.55
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.17.1
@@ -4,9 +4,9 @@ DESCRIPTION=Developer documentation generated from the Linux kernel
 EAPI=5
 HOMEPAGE=http://www.kernel.org/
 IUSE=html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.55.tar.xz
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.17.1.tar.xz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=3d66ebdba60b52e00b3606da1ab01072
+_md5_=17d0636e2c042db0226a98cb1ada7f2a
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.4.104 b/metadata/md5-cache/sys-kernel/linux-docs-3.4.104
new file mode 100644
index 000000000000..929549416924
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-docs-3.4.104
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-text/docbook-sgml-utils app-text/xmlto sys-apps/sed ~app-text/docbook-xml-dtd-4.1.2
+DESCRIPTION=Developer documentation generated from the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.kernel.org/
+IUSE=html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.104.tar.xz
+_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
+_md5_=27999811d916900fe4d88be7b51bc44f
diff --git a/metadata/md5-cache/sys-kernel/linux-docs-3.4.82 b/metadata/md5-cache/sys-kernel/linux-docs-3.4.82
deleted file mode 100644
index ed0f39339603..000000000000
--- a/metadata/md5-cache/sys-kernel/linux-docs-3.4.82
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/docbook-sgml-utils app-text/xmlto sys-apps/sed ~app-text/docbook-xml-dtd-4.1.2
-DESCRIPTION=Developer documentation generated from the Linux kernel
-EAPI=5
-HOMEPAGE=http://www.kernel.org/
-IUSE=html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.82.tar.xz
-_eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	6ce35cb0d56d962486c858d41604c820
-_md5_=9f58640b68a7a52869b859979c0ac732
diff --git a/metadata/md5-cache/virtual/perl-Data-Dumper-2.154.0 b/metadata/md5-cache/virtual/perl-Data-Dumper-2.154.0
index f24b5a7e04bf..82e198258b33 100644
--- a/metadata/md5-cache/virtual/perl-Data-Dumper-2.154.0
+++ b/metadata/md5-cache/virtual/perl-Data-Dumper-2.154.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for Data-Dumper
 EAPI=5
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 RDEPEND=~perl-core/Data-Dumper-2.154.0
 SLOT=0
-_md5_=cc3f0fcdadbbcfccb76f5e59721ac898
+_md5_=1c58d0147907c204291803b39341808f
diff --git a/metadata/md5-cache/virtual/perl-File-Temp-0.230.0-r1 b/metadata/md5-cache/virtual/perl-File-Temp-0.230.0-r1
index 99f6cf645b5a..67ec82d7d499 100644
--- a/metadata/md5-cache/virtual/perl-File-Temp-0.230.0-r1
+++ b/metadata/md5-cache/virtual/perl-File-Temp-0.230.0-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual for File-Temp
 EAPI=5
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=~perl-core/File-Temp-0.230.0
 SLOT=0
-_md5_=8e9b76d893835961143143513cbff323
+_md5_=0f1b10eef66b05465b81ec2917d2a3db
diff --git a/metadata/md5-cache/www-apps/drupal-7.31 b/metadata/md5-cache/www-apps/drupal-7.32
similarity index 88%
rename from metadata/md5-cache/www-apps/drupal-7.31
rename to metadata/md5-cache/www-apps/drupal-7.32
index 43d24bdf4cee..8d95126f900a 100644
--- a/metadata/md5-cache/www-apps/drupal-7.31
+++ b/metadata/md5-cache/www-apps/drupal-7.32
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash,pdo,postgres?,simplexml,xml] virtual/httpd-php accelerator? ( || ( ( <dev-lang/php-5.5 dev-php/pecl-apc ) dev-php/xcache dev-php/eaccelerator ( >=dev-lang/php-5.5[opcache] dev-php/pecl-apcu ) ) ) uploadprogress? ( dev-php/pecl-uploadprogress ) mysql? ( || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) ) sqlite? ( || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) ) >=app-admin/webapp-config-1.50.15
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.31
-SRC_URI=http://drupal.org/files/projects/drupal-7.31.tar.gz
+SLOT=7.32
+SRC_URI=http://drupal.org/files/projects/drupal-7.32.tar.gz
 _eclasses_=webapp	25b9b1696f5e698711f47d45c3d45e3e
-_md5_=c5204d627bc4366608cea5b84dfe604a
+_md5_=73ee82387e4147e150cdcca9a351012d
diff --git a/metadata/md5-cache/www-client/chromium-39.0.2171.19 b/metadata/md5-cache/www-client/chromium-39.0.2171.19
index e6be88e80da1..b71feae1ffc5 100644
--- a/metadata/md5-cache/www-client/chromium-39.0.2171.19
+++ b/metadata/md5-cache/www-client/chromium-39.0.2171.19
@@ -10,4 +10,4 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/sn
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-39.0.2171.19-lite.tar.xz
 _eclasses_=chromium	4a9f555199b35aa57f60b0e9b9627d2a	eutils	32548a82e42dc26e3312581476d2f20c	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	75e24bac8423c515dd9c5717f08feb83	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	linux-info	2b8c53f6065bdee2d757472215a3088f	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	47dda904cf91c61f45b564d9f834fde1	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	6ce35cb0d56d962486c858d41604c820	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7e7c129e7619ac1cf0163841918be707
+_md5_=92d75893b0abba25be52f13ca3136a7d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ae8130d54cbe..de3a05d58146 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Oct 2014 12:07:05 +0000
+Fri, 17 Oct 2014 16:37:06 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 0a7b39ed7e7e..d8d567c7b870 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Oct 17 12:07:02 UTC 2014
+Fri Oct 17 16:37:02 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index a246185ff6a1..b3a2f094c20e 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 17 Oct 2014 12:30:01 +0000
+Fri, 17 Oct 2014 17:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ddfb2d427799..1449ee9f45f0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1413547501 Fri 17 Oct 2014 12:05:01 PM UTC UTC
+1413563701 Fri 17 Oct 2014 04:35:01 PM UTC UTC
diff --git a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
index b18ed5b6d38a..800fee2db009 100644
--- a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
+++ b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.10 2014/09/14 07:28:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.6.0-r1.ebuild,v 1.11 2014/10/17 14:07:21 klausman Exp $
 
 EAPI=5
 inherit eutils flag-o-matic
 
 DESCRIPTION="Network performance benchmark including tests for TCP, UDP, sockets, ATM and more"
 SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
 
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index 23fcc57e1d1f..4a9878e18fbd 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.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-analyzer/traceroute/traceroute-2.0.20.ebuild,v 1.2 2014/07/17 22:57:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-2.0.20.ebuild,v 1.3 2014/10/17 14:11:01 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="static"
 
 RDEPEND="!<net-misc/iputils-20121221-r1"
diff --git a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild b/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
index f46a19fa3b5e..bbbcbb236d3a 100644
--- a/net-libs/libmnl/libmnl-1.0.3-r1.ebuild
+++ b/net-libs/libmnl/libmnl-1.0.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/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.8 2014/10/10 15:21:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmnl/libmnl-1.0.3-r1.ebuild,v 1.9 2014/10/17 14:22:27 klausman Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux"
 IUSE="examples static-libs"
 
 src_configure() {
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 122b941edc2c..7a30b5beeef5 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1 +1,2 @@
 DIST remmina-1.0.0_p20130723.tar.gz 387023 SHA256 675c59ae7df75bbe2661d84655559379f5864b7b273c74111b4c0a889c5efbf5 SHA512 065a585f2c630dbc2cecc4bc52c545ad7c9b66e616cabb9e32f7d3464fcb80b51f52b4707f71e129553bd0d1e9d19fa44d7cdfe749ca9dcb6ac3148630d1f4ea WHIRLPOOL 798ad3c6644719763e2e0a20e02dfcf391f7e6aac77342f167e6f62d11fb98ffc4733d6156137a402e56e87d8ca740a649cca8125047adb04e937f56755d4562
+DIST remmina-1.1.1.tar.gz 797163 SHA256 c96485a919848d9c1602c38075359b10417f4285659588b115b75d2cd5a4e884 SHA512 09bacd725522e0a57a1e387db778fe735d0f0d4ce62a63ad4f02799e225296509d075c56fb0c81d6b0c16ab2242889104271e1ecd508417e0aaeed7a35eea594 WHIRLPOOL 97c8961327cc6c11fa365ca4f2ca6e312b01bf7e0e3fc23e5c23b010b26488696984be4f93130ca8b0266f4dad7d038acfc824ac1d822a822d132a45b7b9158e
diff --git a/net-misc/remmina/remmina-1.1.1.ebuild b/net-misc/remmina/remmina-1.1.1.ebuild
new file mode 100644
index 000000000000..6f002981d410
--- /dev/null
+++ b/net-misc/remmina/remmina-1.1.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-1.1.1.ebuild,v 1.1 2014/10/17 15:54:37 maksbotan Exp $
+
+EAPI="4"
+
+inherit gnome2-utils cmake-utils
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2
+	SRC_URI=""
+	EGIT_REPO_URI="git://github.com/FreeRDP/Remmina.git
+		https://github.com/FreeRDP/Remmina.git"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="A GTK+ RDP, VNC, XDMCP and SSH client"
+HOMEPAGE="http://remmina.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ayatana avahi crypt debug freerdp gnome-keyring nls ssh telepathy vte"
+
+RDEPEND="
+	x11-libs/gtk+:3
+	>=dev-libs/glib-2.31.18:2
+	>=net-libs/libvncserver-0.9.8.2
+	x11-libs/libxkbfile
+	x11-themes/gnome-icon-theme
+	avahi? ( net-dns/avahi[gtk3] )
+	ayatana? ( dev-libs/libappindicator )
+	crypt? ( dev-libs/libgcrypt:0 )
+	freerdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	ssh? ( net-libs/libssh[sftp] )
+	telepathy? ( net-libs/telepathy-glib )
+	vte? ( x11-libs/vte:2.90 )
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND+="
+	!net-misc/remmina-plugins
+"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/remmina-external_tools.patch" )
+
+S="${WORKDIR}/Remmina-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with ayatana APPINDICATOR)
+		$(cmake-utils_use_with avahi AVAHI)
+		$(cmake-utils_use_with crypt GCRYPT)
+		$(cmake-utils_use_with freerdp FREERDP)
+		$(cmake-utils_use_with gnome-keyring GNOMEKEYRING)
+		$(cmake-utils_use_with nls GETTEXT)
+		$(cmake-utils_use_with nls TRANSLATIONS)
+		$(cmake-utils_use_with ssh LIBSSH)
+		$(cmake-utils_use_with telepathy TELEPATHY)
+		$(cmake-utils_use_with vte VTE)
+		-DGTK_VERSION=3
+		-DHAVE_PTHREAD=ON
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/remmina/remmina-9999.ebuild b/net-misc/remmina/remmina-9999.ebuild
index 0000bb30d7eb..43708607625f 100644
--- a/net-misc/remmina/remmina-9999.ebuild
+++ b/net-misc/remmina/remmina-9999.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.34 2014/08/27 07:59:47 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/remmina-9999.ebuild,v 1.35 2014/10/17 15:54:37 maksbotan Exp $
 
 EAPI="4"
 
 inherit gnome2-utils cmake-utils
 
 if [[ ${PV} != 9999 ]]; then
-	inherit vcs-snapshot
-	COMMIT="b6a55ae6f4633d55f8f03e7ce2eeb5899514a8fc"
-	SRC_URI="https://github.com/FreeRDP/Remmina/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit git-2
@@ -53,6 +51,8 @@ RDEPEND+="
 DOCS=( README )
 PATCHES=( "${FILESDIR}/remmina-external_tools.patch" )
 
+S="${WORKDIR}/Remmina-${PV}"
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with ayatana APPINDICATOR)
diff --git a/net-proxy/squid/squid-3.3.13-r1.ebuild b/net-proxy/squid/squid-3.3.13-r1.ebuild
index ad4081f82346..f83ab78cea0c 100644
--- a/net-proxy/squid/squid-3.3.13-r1.ebuild
+++ b/net-proxy/squid/squid-3.3.13-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-proxy/squid/squid-3.3.13-r1.ebuild,v 1.8 2014/10/10 20:09:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squid/squid-3.3.13-r1.ebuild,v 1.9 2014/10/17 13:38:28 ago Exp $
 
 EAPI=5
 inherit autotools eutils linux-info pam toolchain-funcs user versionator
@@ -11,7 +11,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.3/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap icap-client ssl-crtd \
 	mysql postgres sqlite \
diff --git a/perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild b/perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild
index 6a150bbffa83..00f5e94e698c 100644
--- a/perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild
+++ b/perl-core/Data-Dumper/Data-Dumper-2.154.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/perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild,v 1.6 2014/10/06 19:01:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Data-Dumper/Data-Dumper-2.154.0.ebuild,v 1.7 2014/10/17 13:12:57 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Stringified perl data structures, suitable for both printing and eval"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/File-Temp/File-Temp-0.230.0.ebuild b/perl-core/File-Temp/File-Temp-0.230.0.ebuild
index ac7058e2297d..cd507d3d716b 100644
--- a/perl-core/File-Temp/File-Temp-0.230.0.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.230.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/perl-core/File-Temp/File-Temp-0.230.0.ebuild,v 1.7 2014/10/16 15:30:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.230.0.ebuild,v 1.9 2014/10/17 13:27:11 ago Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # bug 390719
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index b4e433ae57b1..0ad7cdcb5cc4 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -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/profiles/arch/alpha/package.use.mask,v 1.165 2014/10/11 15:53:34 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.166 2014/10/17 15:18:26 ottxor Exp $
 
 # Tobias Klausmann <klausman@gentoo.org> (11 Oct 2014)
 # app-emulation/qemu is not keyworded on alpha, masking flag that triggers
@@ -19,10 +19,6 @@ app-accessibility/orca braille
 # media-libs/x265 doesn't work on alpha (bug 519046)
 media-video/ffmpeg x265
 
-# Christoph Junghans <ottxor@gentoo.org> (21 Jul 2014)
-# Missing keywords on sci-libs/libcerf (bug 517726)
-sci-visualization/gnuplot libcerf
-
 # Tobias Klausmann <klausman@gentoo.org (16 Jul 2014)
 # neither dietlibc nor klibc will likely ever build/work on alpha, bug #487672
 >=sys-fs/dmraid-1.0.0_rc16-r3 dietlibc klibc
diff --git a/sci-biology/seqan/Manifest b/sci-biology/seqan/Manifest
index 0f27ed3225a9..376ca66620a2 100644
--- a/sci-biology/seqan/Manifest
+++ b/sci-biology/seqan/Manifest
@@ -1 +1,2 @@
 DIST seqan-1.3.1.zip 8787521 SHA256 87eebe73ace9ada2f4664a768ae212d4acc5fb3ce87702709c3d15bf2d153aeb SHA512 dafacccb4647fd0fc5a055d33390cb85f1c00ca74132e9b3839a739916acf9a2990db7db4f09e34f899b283cad8ccf6553a60cc7693164f250f08260c8ce8ae4 WHIRLPOOL 5a0a80d09e80285a4fc9fb9fb71adbea6b0b324a6a219cd7c9ef3d30e88133f5b25b3cf792b2b89e4ed07ff612f4aa347dc6f94e06974f947fe980c2e0a5d26b
+DIST seqan-src-1.4.2.tar.gz 120601994 SHA256 2b2c48572ea82fc2ac6a6e46bbd4204b6f8200fde717612797426af5ff6b82c3 SHA512 dbb56167c507b70111619a414054d9e70f1db42507bbfdf9e40c5dcbbe9489ad4187d882e638a675e96551c860c08f8203c929c4c9a558b19ea7d6059f50492a WHIRLPOOL 3c7f38e35d826adad94d53d359df8b5f1fb51746f3103457b12b41bd0bf161dc463d4a1932b0b23f2274d723c796116af0940260e1922ce806bb2466445788f0
diff --git a/sci-biology/seqan/files/seqan-1.4.2-include.patch b/sci-biology/seqan/files/seqan-1.4.2-include.patch
new file mode 100644
index 000000000000..5baee4d8ebc0
--- /dev/null
+++ b/sci-biology/seqan/files/seqan-1.4.2-include.patch
@@ -0,0 +1,16 @@
+ core/include/seqan/index/index_qgram_openaddressing.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/include/seqan/index/index_qgram_openaddressing.h b/core/include/seqan/index/index_qgram_openaddressing.h
+index 4a6c2e6..8cc9a42 100644
+--- a/core/include/seqan/index/index_qgram_openaddressing.h
++++ b/core/include/seqan/index/index_qgram_openaddressing.h
+@@ -35,6 +35,8 @@
+ #ifndef SEQAN_HEADER_INDEX_QGRAM_OPENADRESSING_H
+ #define SEQAN_HEADER_INDEX_QGRAM_OPENADRESSING_H
+ 
++#include <smmintrin.h>
++
+ namespace SEQAN_NAMESPACE_MAIN
+ {
+ 
diff --git a/sci-biology/seqan/files/seqan-1.4.2-shared.patch b/sci-biology/seqan/files/seqan-1.4.2-shared.patch
new file mode 100644
index 000000000000..0f438ff07bce
--- /dev/null
+++ b/sci-biology/seqan/files/seqan-1.4.2-shared.patch
@@ -0,0 +1,22 @@
+ util/cmake/SeqAnBuildSystem.cmake | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/util/cmake/SeqAnBuildSystem.cmake b/util/cmake/SeqAnBuildSystem.cmake
+index bcba2c0..d53cd01 100644
+--- a/util/cmake/SeqAnBuildSystem.cmake
++++ b/util/cmake/SeqAnBuildSystem.cmake
+@@ -144,10 +144,10 @@ macro (seqan_register_apps)
+     set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSEQAN_ENABLE_DEBUG=1")
+ 
+     # enable static linkage for seqan apps
+-    if (CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG AND NOT MINGW)
+-      set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+-      set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+-    endif ()
++#    if (CMAKE_COMPILER_IS_GNUCXX OR COMPILER_IS_CLANG AND NOT MINGW)
++#      set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
++#      set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
++#    endif ()
+ 
+     # Get all direct entries of the current source directory into ENTRIES.
+     file (GLOB ENTRIES
diff --git a/sci-biology/seqan/seqan-1.4.2.ebuild b/sci-biology/seqan/seqan-1.4.2.ebuild
new file mode 100644
index 000000000000..f1e36479061b
--- /dev/null
+++ b/sci-biology/seqan/seqan-1.4.2.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/sci-biology/seqan/seqan-1.4.2.ebuild,v 1.1 2014/10/17 13:51:56 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+DESCRIPTION="C++ Sequence Analysis Library"
+HOMEPAGE="http://www.seqan.de/"
+SRC_URI="http://packages.${PN}.de/${PN}-src/${PN}-src-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	sci-biology/samtools"
+DEPEND="${RDEPEND}"
+
+#S="${WORKDIR}"/${P}/cmake
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+	"${FILESDIR}"/${P}-include.patch
+)
+
+src_prepare() {
+	rm -f \
+		util/cmake/FindZLIB.cmake \
+		|| die
+	touch extras/apps/seqan_flexbar/README || die
+	sed \
+		-e "s:share/doc:share/doc/${PF}:g" \
+		-i docs/CMakeLists.txt util/cmake/SeqAnBuildSystem.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DZLIB_INCLUDE_DIRS="${EPREFIX}"/usr/include
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	mkdir -p "${BUILD_DIR}"/docs/html || die
+	cmake-utils_src_install
+	chmod 755 "${ED}"/usr/bin/*sh || die
+}
diff --git a/sci-libs/libcerf/libcerf-1.3.ebuild b/sci-libs/libcerf/libcerf-1.3.ebuild
index c852ee334962..c20fbeccc67e 100644
--- a/sci-libs/libcerf/libcerf-1.3.ebuild
+++ b/sci-libs/libcerf/libcerf-1.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/sci-libs/libcerf/libcerf-1.3.ebuild,v 1.6 2014/08/13 17:59:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libcerf/libcerf-1.3.ebuild,v 1.7 2014/10/17 14:44:01 klausman Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://apps.jcns.fz-juelich.de/src/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
 
 DEPEND=""
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index e3b76f31c023..e38f58564e31 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,4 +1,3 @@
 DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
-DIST gettext-0.19.1.tar.gz 16885689 SHA256 287471d95bdf5feb48626247fdc530660e3d2906a57a141603893772240101c6 SHA512 be67f059f18babbdbb28b2087082be1e7595ecf70d8efc7468629b1b8650abc82d040ea5680596af158bd0d641255fe6930195b8a68797c42cf280b81dca072c WHIRLPOOL 521cdd488065d70c51ed313492d206ee8fce4ccd5b97e7175993401eca0538d5cf252b9c8d1e596b4133a70611c315f140213f040a65773ed48173e6ec414b58
-DIST gettext-0.19.2.1-rc1.tar.xz 6735320 SHA256 33ae93906ce31c59192ffc876cebdd3d971580e6f2792b746f04d5de070e6798 SHA512 01ac816b27f783bf973a868d549a1b16e7d7fdc46b600c5b843f09e6add729d68faf11af45b789c6ca61358e05319480fde581bb20cefa1d4a06f2013604113f WHIRLPOOL 77053a60f7a2a55d4fb5c5be31dd19aaf4e8a401901ba8768b1cd2923d0134c58d25a6b0e027e2f38b86c6b42e1ef32fbdeb51e1dc66e043d02fcfc61078c8d8
 DIST gettext-0.19.2.tar.gz 17141404 SHA256 0c48ae6ef6e0abcf6cd9cb9dcdc593d0e1a367e82259bbe113ce88ceea9249bb SHA512 540440b41025a68eed3e77530be77e1b0fc68ce74e56f0e8b724c843cc2f2fc968bbb7627006bbe4fa83b5042bd860136a67f63dcf22d5f79e0f60f4df2279e7 WHIRLPOOL efa858843c209a6c70c2e2c26991a7d8065e774d6f63c52e2606ce9806924781bd681e37b51f6086be4daa8672849027a1fb53563777ec69f848e1ba0a3e0aa9
+DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
diff --git a/sys-devel/gettext/gettext-0.19.1.ebuild b/sys-devel/gettext/gettext-0.19.1.ebuild
deleted file mode 100644
index 502f9110a7e5..000000000000
--- a/sys-devel/gettext/gettext-0.19.1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.1.ebuild,v 1.3 2014/10/12 01:37:17 blueness Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
-
-if [[ ${PV} =~ _rc ]] ; then
-	SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS=""
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	dev-libs/libxml2
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r11
-	)"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="/usr/share/doc/${PF}"
-
-		$(use_enable cxx libasprintf)
-		$(use_enable java)
-		$(use_enable static-libs static)
-	)
-
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc || use elibc_musl ; then
-		myconf+=(
-			--without-included-gettext
-			$(use_enable nls)
-		)
-	else
-		myconf+=(
-			--with-included-gettext
-			--enable-nls
-		)
-	fi
-	use cxx || export CXX=$(tc-getCC)
-
-	# Should be able to drop this hack in next release. #333887
-	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	else
-		# remaining switches
-		myconf+=(
-			# Emacs support is now in a separate package
-			--without-emacs
-			--without-lispdir
-			# glib depends on us so avoid circular deps
-			--with-included-glib
-			# libcroco depends on glib which ... ^^^
-			--with-included-libcroco
-			# this will _disable_ libunistring (since it is not bundled),
-			# see bug #326477
-			--with-included-libunistring
-
-			$(use_enable acl)
-			$(use_enable ncurses curses)
-			$(use_enable openmp)
-			$(use_with git)
-			$(usex git --without-cvs $(use_with cvs))
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-
-		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
-	if use java ; then
-		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		fi
-	fi
-
-	if use doc ; then
-		dohtml "${D}"/usr/share/doc/${PF}/*.html
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
-	fi
-	rm -f "${D}"/usr/share/doc/${PF}/*.html
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-}
-
-pkg_preinst() {
-	# older gettext's sometimes installed libintl ...
-	# need to keep the linked version or the system
-	# could die (things like sed link against it :/)
-	preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-}
diff --git a/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild b/sys-devel/gettext/gettext-0.19.3.ebuild
similarity index 98%
rename from sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild
rename to sys-devel/gettext/gettext-0.19.3.ebuild
index 40d1d433329e..f67a0f80b17e 100644
--- a/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.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/sys-devel/gettext/gettext-0.19.2.1_rc1.ebuild,v 1.2 2014/10/12 01:37:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.3.ebuild,v 1.1 2014/10/17 16:25:10 polynomial-c Exp $
 
 EAPI="4"
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 25bb9e00f209..5f0a6e3e3309 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -55,6 +55,9 @@ DIST genpatches-3.16-8.extras.tar.xz 17660 SHA256 628ac76c67579c3aea1724180d4f72
 DIST genpatches-3.17-2.base.tar.xz 17028 SHA256 e62e615c8a45258645ce39c481013ebcedf1b6d87629abb660ff9dff6116a287 SHA512 a71018ddaacf02ddc9a85ce6fe06445e159736333dcf5586acfea1513dcd2853c5e28c0cb9fbd87a8ca3d6891ae8c0d45a98238d4fcb339f145c5bc77b61e485 WHIRLPOOL f8bb13ffc69e64b3ed0c0de1f9795fcc6adaaf56133d8e8494c1ca2c052cc322fd6aafad59c6b94f92793fce38d393e039a0d9c750a6e4a80f247f90f09138b5
 DIST genpatches-3.17-2.experimental.tar.xz 3552 SHA256 f5d0de59e05adc4fbc871de1f4c3bd588744848a2626a2e993cb511dca9c350a SHA512 0473b7b36241d86f02090f0ef877f71241fbad98584a8deb9f94bb0eab845b9aea23e1be49caa6b36b5de6d57a025417f0138dfe6f97072d9be91e660947a818 WHIRLPOOL 1fae644455882d80f988acc4bc99568a9b2979045b2b70758f71e5effa79a346e5e7fad85e584e3e065267eac2f480e2991c8bf2476d2a2e6f028403517a7cc8
 DIST genpatches-3.17-2.extras.tar.xz 16164 SHA256 911f3b578907d5edb7a215a0e4e04daa7f453f796e3a35d662d6ffcfd4921912 SHA512 1d109ca1e40b513d0f7a0c9085e4ca69eeb342221327c373c33c072752ab234fc6c9032fce005bdc6219367947e0a95116ae6c68d1ea31c1ad097f233d8a33b1 WHIRLPOOL e02df791f7fec72591eb7f3cf605ea9db4ff9908268546ab1c6fa6f55bff85b8c766246d68df7af3dad6b03a576d4439f52808b63f9e00b409767911a9e3e994
+DIST genpatches-3.17-3.base.tar.xz 19356 SHA256 cab4ae1f4a634a80fdaed7564409c07b21f92fb82939926ce5b811629f937261 SHA512 f7178667443ad7c0b74dd5ccf71e43d300f69bd27f79fdd126e46f5b0978b9c80aeda1fe0960285f4f8b25ca1a68598088814c74476a4aa128188ad116debb6d WHIRLPOOL 00f0c02b735ef06d86d386c8c09d8daa86368f00d1b84525f513923c5657a5bb05a4c6cc162c7639c92c9ff2f55401a9d5df6679362c28471e3aa0370f1c23ac
+DIST genpatches-3.17-3.experimental.tar.xz 3552 SHA256 f5d0de59e05adc4fbc871de1f4c3bd588744848a2626a2e993cb511dca9c350a SHA512 0473b7b36241d86f02090f0ef877f71241fbad98584a8deb9f94bb0eab845b9aea23e1be49caa6b36b5de6d57a025417f0138dfe6f97072d9be91e660947a818 WHIRLPOOL 1fae644455882d80f988acc4bc99568a9b2979045b2b70758f71e5effa79a346e5e7fad85e584e3e065267eac2f480e2991c8bf2476d2a2e6f028403517a7cc8
+DIST genpatches-3.17-3.extras.tar.xz 16156 SHA256 2b7be75015006f577aa4cae61f252bfd70202950dc6032dfafa89cee95004030 SHA512 457db9f84251ae557610f5bcc389c61e160870eef2a16f2d5a8437d96e7ab92a89cb59f1b056d0632bae12cd92a5ce017303b7ab52034fd59be24b0c2dc44dba WHIRLPOOL 23dc85f39fa7daacd92ea617c461585d5197e12d291e7dc14cc5088d510d990df1c77ca4856292cc2ec835287f9d9067c5dbbd8c1b216c96fdccdc928aebf9a3
 DIST genpatches-3.4-87.base.tar.xz 1210220 SHA256 a2689a56e567805b5ed8e842c692c0cfded629bf2958ecc171b1d1ae3e5496b4 SHA512 ece2ab756f83101cfca81f4b7fff3335336428dbc4b98915c6526801c2051f961d0cf88dd3b9e6a1b925d758e379346ed913efbf8328f7108769588630d9fd60 WHIRLPOOL 0945380bd8df7772f42cefe970779a4f6cda42d77aa25f3043d34837729161bef15018daa96104872661c2171f7af6d2eccdfae2faa91bf29509f8a5190901c3
 DIST genpatches-3.4-87.extras.tar.xz 18208 SHA256 d1ffb428d8e9c3553dbc0bf078fc3b7d4c6f8d27e0e0fa5dd71385d84549a9fb SHA512 823a35f8e140b2553dbb8b8dad20dd100db80699bf0ac94b42f8b194141ed44f79ca69ce88ef343c2c9332568cabdb8281331fa5235d8da4d3a855bf4a3b230a WHIRLPOOL 95d5ac7047e14940c3e774a9694e344f114e135b74d3e43b0cf5a2da173c08594b2daa78d28aabd4b1c9fb8e29019e8111a51a19243f0a206c4f7abbf9e43f22
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.17.1-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.17.1-r1.ebuild
new file mode 100644
index 000000000000..ce86466ae1c1
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.17.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-3.17.1-r1.ebuild,v 1.1 2014/10/17 12:27:32 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/linux-docs/Manifest b/sys-kernel/linux-docs/Manifest
index e067ba0ab6f1..6143212acd14 100644
--- a/sys-kernel/linux-docs/Manifest
+++ b/sys-kernel/linux-docs/Manifest
@@ -1,5 +1,6 @@
-DIST linux-3.10.32.tar.xz 73249988 SHA256 8ac6a70e82fe969ece841f68679c0567aea7e43d423663b81aaa9d3afc92965b SHA512 f503705b58f62f6cb071225b954929da23615e41a8d997e4ade46d307eca80b26d3e6f58d1d24efa0b6865af7b9a32caf277fa0040e0110decd7f6d2b3f92c85 WHIRLPOOL 28f58341ccb9aeffbbd05bf926fe9ef4024ea2376a3169abfc8a11e656cae6d75d8f7882f666ea03dd2d6e825001737fc6b86fbf783d9800430836ffa629cb9c
-DIST linux-3.12.16.tar.xz 76414340 SHA256 ce7f26c4c9e3f57d2a07dd5ab5e490ac1c6a2ad9a9ee7aae3d4a8787978b70c8 SHA512 a3b012c07f5a41f8d01c759c5d277cbad8a7ac9c02f1457054ba113dfdd92b3218588f97138e083e2e867710d44cd319871631fd5c7de3bfdbf1437a880e2e27 WHIRLPOOL d7130f3ac10578146dd14914dccb957e7ebe2ec2fc5db6d232d2e93146fadfcc00351d84bda774c63d448543738b5c81c94a82ffa923ab285e5049db9354688d
-DIST linux-3.13.9.tar.xz 77204680 SHA256 4124759701cd508c81c6224dd417932ba0091bd47ac7924ac934f17d6bafddd9 SHA512 9debf32a0cab9239e0b03c940e68d92d3946398e6deb20510f0ea67cb5d75dec9765769c0223399ee19674535500bd650dfe7431fad3f9d18389d495805cfa46 WHIRLPOOL dd7f667d40a522f08d584235768f7d7e246dc0a571405f00e247eb470b1e5ce6874d5a47325003d149890927ad8196e3abc98b67aab7048e27c57eaf58a214ce
-DIST linux-3.2.55.tar.xz 65592168 SHA256 35c9ce911cba3df716998922e4fd28ebf7130bc16de1a8838da2a835da3cd295 SHA512 8b5f8246d39245fe87311417d1ab6496896188dcdd01085853b88e49adf3ac396c2a4a8a8d50ebe4400b5e232f123388c3873a2ee2d047a1f7ddff621bbd1ef5 WHIRLPOOL 1ec890196a47b92e6490a6cefdb53311f5e1d600f415471e80318bb4343d7fb33d44de7fc60f083b3ebf37c1b73fd88172be0fc30ee6ad39b076447bb40a8128
-DIST linux-3.4.82.tar.xz 67162412 SHA256 3de4ac1dc48a5545c12761046ce6ebe2eea19a9113b3e7fafd970e4dd86a33fc SHA512 600012ff3b8238014e8c30c9a30715c9265654c9328ba760af3284ef378ee8f7223851949d6759a7c4d2d1bc2b7907ff83fc56a2ed03926244265f7afa00dd12 WHIRLPOOL 49f0f772cad2f077f9d697967818029469c970178790c54df1f92bd0366cac02dfc0f57b1a76c60beb759b3635abe163024631d2370630e4577bc842b24df829
+DIST linux-3.10.58.tar.xz 73287940 SHA256 dffd5af29d516caf1b2fba8360acad81eec24af744e2da4e28ca3289e113961b SHA512 cfca039bfd919fecc87db1b5b7b408510f161eae2bcf7e2eb317473f52c553acd2d2e3a7afc4da10e84463b3ce362e9a7cb8cc0db7b6625bf1b5461b82833d77 WHIRLPOOL 975ad7aba0ba34c06e7df83424a63764edf54c26924006c942995a60d730c6e71d14bccc778b4e25bd00cb6cad02d917889d728de16a880f2cc7d9dc251d6d69
+DIST linux-3.12.30.tar.xz 76465772 SHA256 24941aa7e5b9c556080d59e63ef9eea4e739ed1b29d367d2e777243f90633480 SHA512 3f0b188547f0f0adcd8d7e6246465020bee316eda8ca20be8140f2115ae04d58a3d2e37ef60480ebe009797c71db5a14dd60cfcff958561cb12d313ee0d18499 WHIRLPOOL d139c36f20d08cb721c1ac08e48e33aba04b1b04c199b557ab814dbb3fb048d6ccf0f0e4fcf5bb2c430888dfa891981770e1973f7cbdda49ba5c284fbaa44a91
+DIST linux-3.14.22.tar.xz 78451580 SHA256 77a0c7a41b1fc4232a959c539e48f98071769c8cc553e013291fbfadba62b084 SHA512 2d2f40fc18f2769a1fe53115de91ea37aeab53f5b4ca9bedaf7622447c87a97c5d59c2e4a3faf1356d00a365a970d7a53d98fdbdc7e967aef402918e7bff9b61 WHIRLPOOL 89768ea13f7e1b912feabb303e6146dc0886702c3133cb15d4f2351ddc6976af4b135a61f0dc78f3a4da6a51ea515cd322f008e9074b3d427a6116b287aa197a
+DIST linux-3.16.6.tar.xz 80524980 SHA256 31e9dcffd79933040b8a91d36ac1d75fa4ad554656665c3d9c8fbd9fa73006f2 SHA512 ef850b73d28f3432d55389a251bf4244c464af52ff02ed87a5707ff4467932b7b8f12182017f73e73671ae893b44e17e4f4414b023848b8ba4869b1cd3ac6086 WHIRLPOOL a23c1503bdaf3ffe2bc1ea2351d2a0612d20f6d144d5a2d2595fc051ac2292da84d91053c64f4391b91bcc46edf0fe0bee49329ff8ca70beafc04e50e4c0571b
+DIST linux-3.17.1.tar.xz 80315188 SHA256 2c9c002cf9618962883d82ba3e1caaea29af4ea37147a82bad422afdc8d21dc2 SHA512 89c38d7b9dcc3f3de65b1f46266e1d02a2444316fac53fa70b49f6a01b42f420d87a0dcdd2a5730d7fb0453ace77e4b7ced5b80dcee5eaf65d8619bf0c1c93ec WHIRLPOOL e2eacae2ac42ea1e24d517ebd2f8b0ee06d9936fbf590e606236b66ab5b7634de6c63c01abbe01fcae5492d19d792fea453b907668aefb405a314301f5f7ea4e
+DIST linux-3.4.104.tar.xz 67176948 SHA256 8bf42d8befdd61a296546dfb626eca7c108b7c3eb0c284f4bd4273c628e1c275 SHA512 a8d86b0fa9bbb602262f8e4155870a5e33224597030d6b6777480ea81127564d9bf94389d8adb59c8e9cec2f586f59031968d33ec3b6b82c10e13924c303872b WHIRLPOOL 95cb16ceab4899689145385c5acbe4cf46682e9f5258dc99b6b890347c06aba903858a0fd98d9d34a264a9db46c54e9fa6da0821bb33bd3a2a3fb6a82ba7f451
diff --git a/sys-kernel/linux-docs/linux-docs-3.10.32.ebuild b/sys-kernel/linux-docs/linux-docs-3.10.58.ebuild
similarity index 83%
rename from sys-kernel/linux-docs/linux-docs-3.10.32.ebuild
rename to sys-kernel/linux-docs/linux-docs-3.10.58.ebuild
index 1915bfb7af57..3c0e0ab8b5aa 100644
--- a/sys-kernel/linux-docs/linux-docs-3.10.32.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.10.58.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/linux-docs/linux-docs-3.10.32.ebuild,v 1.2 2014/04/14 14:26:18 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.10.58.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.12.16.ebuild b/sys-kernel/linux-docs/linux-docs-3.12.30.ebuild
similarity index 83%
rename from sys-kernel/linux-docs/linux-docs-3.12.16.ebuild
rename to sys-kernel/linux-docs/linux-docs-3.12.30.ebuild
index e38851da5619..5d6703a8bfc4 100644
--- a/sys-kernel/linux-docs/linux-docs-3.12.16.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.12.30.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/linux-docs/linux-docs-3.12.16.ebuild,v 1.1 2014/04/14 14:29:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.12.30.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild b/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild
new file mode 100644
index 000000000000..eee27e9ff656
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.14.22.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=linux-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Developer documentation generated from the Linux kernel"
+HOMEPAGE="http://www.kernel.org/"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="html"
+DEPEND="app-text/docbook-sgml-utils
+		app-text/xmlto
+		sys-apps/sed
+		~app-text/docbook-xml-dtd-4.1.2"
+RDEPEND=""
+
+src_prepare() {
+
+	sed -i \
+		-e "s:db2:docbook2:g" \
+		-e "s:/usr/local/man:${D}/usr/share/man:g" \
+		"${S}"/Documentation/DocBook/Makefile
+
+	# fix for parallel build as per bug #248337
+	sed -i \
+		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
+		"${S}"/Makefile
+}
+
+src_compile() {
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	emake mandocs || die "make mandocs failed"
+
+	if use html; then
+		emake htmldocs || die "make htmldocs failed"
+	fi
+}
+
+src_install() {
+	local file
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	make installmandocs || die "make installmandocs failed"
+
+	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
+		for file in Documentation/DocBook/*.html; do
+			dohtml -r ${file/\.html/}
+		done
+	fi
+}
diff --git a/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild b/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
similarity index 88%
rename from sys-kernel/linux-docs/linux-docs-3.13.9.ebuild
rename to sys-kernel/linux-docs/linux-docs-3.16.6.ebuild
index abe126453844..a7c7fac65dd4 100644
--- a/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.16.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/sys-kernel/linux-docs/linux-docs-3.13.9.ebuild,v 1.1 2014/04/14 14:39:00 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.16.6.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild b/sys-kernel/linux-docs/linux-docs-3.17.1.ebuild
similarity index 83%
rename from sys-kernel/linux-docs/linux-docs-3.2.55.ebuild
rename to sys-kernel/linux-docs/linux-docs-3.17.1.ebuild
index fd3af8d77cf2..13afecb7e747 100644
--- a/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild
+++ b/sys-kernel/linux-docs/linux-docs-3.17.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/sys-kernel/linux-docs/linux-docs-3.2.55.ebuild,v 1.2 2014/04/14 14:22:01 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.17.1.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 IUSE="html"
 DEPEND="app-text/docbook-sgml-utils
@@ -55,6 +55,9 @@ src_install() {
 	make installmandocs || die "make installmandocs failed"
 
 	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
 		for file in Documentation/DocBook/*.html; do
 			dohtml -r ${file/\.html/}
 		done
diff --git a/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild b/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild
new file mode 100644
index 000000000000..1cbca14ce6b1
--- /dev/null
+++ b/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-docs/linux-docs-3.4.104.ebuild,v 1.1 2014/10/17 13:15:09 mpagano Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+MY_P=linux-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Developer documentation generated from the Linux kernel"
+HOMEPAGE="http://www.kernel.org/"
+SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+IUSE="html"
+DEPEND="app-text/docbook-sgml-utils
+		app-text/xmlto
+		sys-apps/sed
+		~app-text/docbook-xml-dtd-4.1.2"
+RDEPEND=""
+
+src_prepare() {
+
+	sed -i \
+		-e "s:db2:docbook2:g" \
+		-e "s:/usr/local/man:${D}/usr/share/man:g" \
+		"${S}"/Documentation/DocBook/Makefile
+
+	# fix for parallel build as per bug #248337
+	sed -i \
+		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
+		"${S}"/Makefile
+}
+
+src_compile() {
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	emake mandocs || die "make mandocs failed"
+
+	if use html; then
+		emake htmldocs || die "make htmldocs failed"
+	fi
+}
+
+src_install() {
+	local file
+	local ARCH=$(tc-arch-kernel)
+	unset KBUILD_OUTPUT
+
+	make installmandocs || die "make installmandocs failed"
+
+	if use html; then
+		# There is no subdirectory named "index"
+		dohtml Documentation/DocBook/index.html
+		rm Documentation/DocBook/index.html
+		for file in Documentation/DocBook/*.html; do
+			dohtml -r ${file/\.html/}
+		done
+	fi
+}
diff --git a/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild b/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild
deleted file mode 100644
index 4e5a6f0e41a5..000000000000
--- a/sys-kernel/linux-docs/linux-docs-3.4.82.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/sys-kernel/linux-docs/linux-docs-3.4.82.ebuild,v 1.2 2014/04/14 13:40:22 mpagano Exp $
-
-EAPI=5
-inherit toolchain-funcs
-
-MY_P=linux-${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Developer documentation generated from the Linux kernel"
-HOMEPAGE="http://www.kernel.org/"
-SRC_URI="mirror://kernel/linux/kernel/v3.x/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-IUSE="html"
-DEPEND="app-text/docbook-sgml-utils
-		app-text/xmlto
-		sys-apps/sed
-		~app-text/docbook-xml-dtd-4.1.2"
-RDEPEND=""
-
-src_prepare() {
-
-	sed -i \
-		-e "s:db2:docbook2:g" \
-		-e "s:/usr/local/man:${D}/usr/share/man:g" \
-		"${S}"/Documentation/DocBook/Makefile
-
-	# fix for parallel build as per bug #248337
-	sed -i \
-		-e "s:\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:+\$(Q)\$(MAKE) \$(build)=Documentation\/DocBook \$@:" \
-		"${S}"/Makefile
-}
-
-src_compile() {
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	emake mandocs || die "make mandocs failed"
-
-	if use html; then
-		emake htmldocs || die "make htmldocs failed"
-	fi
-}
-
-src_install() {
-	local file
-	local ARCH=$(tc-arch-kernel)
-	unset KBUILD_OUTPUT
-
-	make installmandocs || die "make installmandocs failed"
-
-	if use html; then
-		for file in Documentation/DocBook/*.html; do
-			dohtml -r ${file/\.html/}
-		done
-	fi
-}
diff --git a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.0.ebuild b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.0.ebuild
index f01585f1f0ec..1f390920aa11 100644
--- a/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.0.ebuild
+++ b/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.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/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.0.ebuild,v 1.3 2014/10/09 19:22:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Data-Dumper/perl-Data-Dumper-2.154.0.ebuild,v 1.4 2014/10/17 13:13:02 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="~perl-core/${PN#perl-}-${PV}"
diff --git a/virtual/perl-File-Temp/perl-File-Temp-0.230.0-r1.ebuild b/virtual/perl-File-Temp/perl-File-Temp-0.230.0-r1.ebuild
index 861a35df51e5..7cfac1f95b69 100644
--- a/virtual/perl-File-Temp/perl-File-Temp-0.230.0-r1.ebuild
+++ b/virtual/perl-File-Temp/perl-File-Temp-0.230.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/virtual/perl-File-Temp/perl-File-Temp-0.230.0-r1.ebuild,v 1.6 2014/10/16 15:31:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-File-Temp/perl-File-Temp-0.230.0-r1.ebuild,v 1.8 2014/10/17 13:27:07 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 RDEPEND="
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index a7ff3e4b542f..2c5408711a9d 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,2 +1,2 @@
 DIST drupal-6.33.tar.gz 1103496 SHA256 952f9bd6b22058fe8f9c90c0ac96bd695a673306331269a79c7e19e38fd047eb SHA512 71c272800712493e33f05e58e58da1217c793a6158a84613f7443ee97b2df09cc977621cee353286836513c5f6355187d4eb11f28e8913b58434291f52eae8ee WHIRLPOOL 86fe2eb608c1d43ad83d4b253762d5f82ae9b6f4dd8282bdad34e7fe584bab0d9bdfddbb78dd373c733a85934f00282ec36b3d05d2992dc168f6fce828715d95
-DIST drupal-7.31.tar.gz 3216766 SHA256 6af4849fd2e1fd0a186a5264de10613e57b84c69dbe7dec0754472d27f37af40 SHA512 51cd83974d376714f278e1263b8835163d4528c3ba96f5a134b1e1db5d2145e8bc043561de667b7348152f123ef9ce9ef9b109dfc561b5256ad1a56f0b99ee0d WHIRLPOOL da110bfbfcc723d62e53604c46f688be7e5257a70f45abde249126da1b6593a0e42a2f303b0d8f097272a278d7183059feff1148c71963e75a50efa08269a08f
+DIST drupal-7.32.tar.gz 3215563 SHA256 f36d5ab0891997bf3c681b76151c6b015b0bb9041610e1c9af7d17e28dc15c39 SHA512 8d2b2f9cf525a3f0c5fb843d7c0cc70fbb8a5c1f60d898dd74d848b4d0f29eb70b2163b81db0fbb1d24e91d2fb6d58e34d2d6bde37175331855312d4e2b2481a WHIRLPOOL c968fdbcdcc1076b91952dc71385cdbd4e831f2f2c080a9c6ea4b22b33157018dd2bdf02909579ffabe0e98b6635d9614b68d772932a616cb708c8516850bde1
diff --git a/www-apps/drupal/drupal-7.31.ebuild b/www-apps/drupal/drupal-7.32.ebuild
similarity index 94%
rename from www-apps/drupal/drupal-7.31.ebuild
rename to www-apps/drupal/drupal-7.32.ebuild
index 6bf09c759fde..7d6d74258bd7 100644
--- a/www-apps/drupal/drupal-7.31.ebuild
+++ b/www-apps/drupal/drupal-7.32.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-apps/drupal/drupal-7.31.ebuild,v 1.1 2014/08/14 12:59:01 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/drupal/drupal-7.32.ebuild,v 1.1 2014/10/17 13:02:55 jmbsvicetto Exp $
 
 EAPI=5
 
diff --git a/www-client/chromium/chromium-39.0.2171.19.ebuild b/www-client/chromium/chromium-39.0.2171.19.ebuild
index f047b1975663..21b431c9889b 100644
--- a/www-client/chromium/chromium-39.0.2171.19.ebuild
+++ b/www-client/chromium/chromium-39.0.2171.19.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/chromium/chromium-39.0.2171.19.ebuild,v 1.1 2014/10/11 10:04:21 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-39.0.2171.19.ebuild,v 1.2 2014/10/17 16:21:48 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -177,6 +177,7 @@ src_prepare() {
 	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
 	# fi
 
+	epatch "${FILESDIR}/${PN}-gcc-4.7-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
 
 	epatch_user