diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
index 68fc3c00205d..faa36d56f606 100644
--- a/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.6 2013/08/31 14:48:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r2.ebuild,v 1.7 2013/09/02 11:11:21 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild
index 0d0222352507..610394a4bc3d 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild,v 1.8 2013/08/29 19:48:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r6.ebuild,v 1.9 2013/09/02 11:11:34 ago Exp $
 
 inherit eutils autotools systemd
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~sparc x86"
 IUSE="nls"
 
 DEPEND=""
diff --git a/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
index 2bce8d5a6d1f..ace59117d8ae 100644
--- a/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
+++ b/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild,v 1.5 2013/08/29 19:47:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-it/man-pages-it-2.80-r1.ebuild,v 1.6 2013/09/02 11:14:07 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.gz"
 
 LICENSE="man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-misc/gentoo/gentoo-0.20.1.ebuild b/app-misc/gentoo/gentoo-0.20.1.ebuild
index 34bcc42ef212..9c4ff796040c 100644
--- a/app-misc/gentoo/gentoo-0.20.1.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.1.ebuild,v 1.7 2013/08/29 19:48:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.1.ebuild,v 1.8 2013/09/02 11:11:09 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
index ae14683e6191..7cc29cffa885 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.10 2012/10/28 07:53:43 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.11 2013/09/02 12:51:12 hattya Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit eutils java-pkg-opt-2 multilib
 
@@ -17,7 +17,7 @@ IUSE="cxx debug java perl ruby zlib"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	perl? ( dev-lang/perl )
-	ruby? ( dev-lang/ruby:1.8 )
+	ruby? ( dev-lang/ruby )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 26ab6ab62d08..7485ae5bc1b4 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -3,7 +3,6 @@ DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783
 DIST glib-2.32.4-AS_IF-patches.tar.xz 8584 SHA256 c61a87bbed8b09148f70f2651696430ab262d8ee905ebe2e0e963bb9038c5545 SHA512 cea825c379ea9014014f8a6f3a9fcf228e6b4245c649df4d86f6d86d1d655fd927ef1115fd66521cc48b2929d8cd504a284c7a8fb5ff38dc2b83ac4140655049 WHIRLPOOL e778094ad8ebe6fdc236942c21ee8ce2266712a08672b521f931159dd81d3452fcb8b6556c98c82b60548b1d9703a3ff332d02970a01565b6f5c4bcd02e74b46
 DIST glib-2.32.4.tar.xz 6178556 SHA256 a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2 SHA512 bc8b2d6afae7635f940065eca3e854ee171812c7b582d55313db11d28875495dbf41fc0a260347b30f7490daa65ccc377d8a2d60bb3a26d07997606d8e3d989f WHIRLPOOL 35aec94088acff460685c0b1bb2e6fcffadb0f9f0044b93f3fa042ed82dd52efb5e56022575c0ebcfda4230d38edc26a916623f0bfcbfc8e1c6b76a3133d43bc
 DIST glib-2.34.3.tar.xz 6334872 SHA256 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7 SHA512 2382e09159da2ef47384a3e52622f139577af69d6aba86ea1636f2b6b23b9f6bf89967f29394fd7f93d0528e2c58ae015864aa58a3e3e4f504c7a268b2ef4a75 WHIRLPOOL 296f29666bdd38faae41a1b0b7875dd5fb6ac23d5d27282658e73bbb614db944b3a92d5334ddcca19f959e4c5ef2bf20a5b0f19390558645f986afc2f84edd4d
-DIST glib-2.36.3.tar.xz 6626972 SHA256 5ec433bf6ce02e4c436619c3d0b9cecdd1898469398a636bad27c1f5804c761e SHA512 1ea45e7978bffb8ec23c8eddb74b0bab686126fd55d96956203bc1eef44e3047edcf2cbc39e018c83e56093f806c739bf320e6a359b45cd652e55c94a6f1ad19 WHIRLPOOL b6e997381fe451fe90f17478a6a3e3ddb75ca028a6f0adce1e970faef7dd64f2d88fa7a5557971bcba8e047a72801332f1804c815a9a45907dc0f468b888b404
 DIST glib-2.36.4.tar.xz 6570720 SHA256 f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e SHA512 ed3b01051695858724d854c4d1c20df19d4c19526538d87c995e41376e3479e5758afccc9550cf7f4d1104bdd4edb8b436a716ab2b95e7bdf198ff3f17749304 WHIRLPOOL 7997c5182c605ded87aac79b75b83a0aaf30dc9eb4a657aed77fe883946e7fe07e2257f3b1b6749ca7d3c921e041067907f8f2f16fae7ebfe99e1adbbeea12b5
 DIST pkg-config-0.26.tar.gz 396399 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 WHIRLPOOL f535946a02192a9bffc7be0fae454e25aa86af8bac7f47622d52ed13f77f1ba05ff9b5693b2a501981e3991e4e1595eced22dee4ab748b310baa7d57267a62a7
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
diff --git a/dev-libs/glib/files/glib-2.36.3-revert-ext34.patch b/dev-libs/glib/files/glib-2.36.3-revert-ext34.patch
deleted file mode 100644
index 041419791273..000000000000
--- a/dev-libs/glib/files/glib-2.36.3-revert-ext34.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 05d430065da918051a97e3384c4b2252af47503d Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 20 Jun 2013 17:13:29 +0000
-Subject: Revert "g_file_set_contents(): don't fsync on ext3/4"
-
-We didn't actually do any real-world testing of this, and
-unsurprisingly it turns out to break in at least one widely-used
-configuration (Fedora 19 x86_64, ext4 on LVM).
-
-This reverts commit 9d0c17b50102267a5029b58b1f44efbad82d8f03.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=701560
----
-diff --git a/glib/gfileutils.c b/glib/gfileutils.c
-index b6ca3bb..2980098 100644
---- a/glib/gfileutils.c
-+++ b/glib/gfileutils.c
-@@ -1088,16 +1088,9 @@ write_to_temp_file (const gchar  *contents,
-     /* On Linux, on btrfs, skip the fsync since rename-over-existing is
-      * guaranteed to be atomic and this is the only case in which we
-      * would fsync() anyway.
--     *
--     * ext3 and ext4 are also safe in this respect under the default
--     * mount options (and if someone picks non-default options to
--     * improve their performance at the cost of reliability, who are we
--     * to argue?)
--     *
--     * Note: EXT[234]_SUPER_MAGIC are equal.
-      */
- 
--    if (fstatfs (fd, &buf) == 0 && (buf.f_type == BTRFS_SUPER_MAGIC || buf.f_type == EXT3_SUPER_MAGIC))
-+    if (fstatfs (fd, &buf) == 0 && buf.f_type == BTRFS_SUPER_MAGIC)
-       goto no_fsync;
-   }
- #endif
---
-cgit v0.9.2
diff --git a/dev-libs/glib/files/glib-2.36.4-znodelete.patch b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
new file mode 100644
index 000000000000..e84e76f28b2f
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.36.4-znodelete.patch
@@ -0,0 +1,65 @@
+From 242de638a030e1fb3b467af182d985d7c3bbf185 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 2 Sep 2013 13:59:18 -0400
+Subject: [PATCH] gobject: try to link with -Wl,-z,nodelete
+
+Since the type system does not support reloading its data and assumes
+that libgobject remains loaded for the lifetime of the process, we
+should link libgobject with a flag indicating that it can't be unloaded.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=707298
+---
+ configure.ac        | 24 ++++++++++++++++++++++++
+ gobject/Makefile.am |  1 +
+ 2 files changed, 25 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 0a63601..dd1045a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3668,6 +3668,30 @@ fi
+ AC_SUBST(GLIB_LINK_FLAGS)
+ 
+ dnl
++dnl Check for -z,nodelete linker flag: the type system assumes that
++dnl libgobject stays loaded for the lifetime of the process
++dnl
++
++AC_ARG_ENABLE([znodelete],
++              [AS_HELP_STRING([--disable-znodelete],
++                              [avoid linking with -z,nodelete])],,
++              [SAVED_LDFLAGS="${LDFLAGS}"
++               AC_MSG_CHECKING([for -z,nodelete linker flag])
++               LDFLAGS=-Wl,-z,nodelete
++               AC_TRY_LINK([], [int main (void) { return 0; }],
++                           AC_MSG_RESULT(yes)
++                           enable_znodelete=yes,
++                           AC_MSG_RESULT(no)
++                           enable_znodelete=no)
++               LDFLAGS="${SAVED_LDFLAGS}"])
++
++if test "x${enable_znodelete}" = "xyes"; then
++  GOBJECT_LINK_FLAGS=-Wl,-z,nodelete
++fi
++
++AC_SUBST(GOBJECT_LINK_FLAGS)
++
++dnl
+ dnl Check for -fvisibility=hidden to determine if we can do GNU-style
+ dnl visibility attributes for symbol export control
+ dnl
+diff --git a/gobject/Makefile.am b/gobject/Makefile.am
+index 1509616..181ad7d 100644
+--- a/gobject/Makefile.am
++++ b/gobject/Makefile.am
+@@ -45,6 +45,7 @@ endif
+ 
+ libgobjectincludedir = $(includedir)/glib-2.0/gobject
+ libgobject_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
++  $(GOBJECT_LINK_FLAGS) \
+   $(gobject_win32_res_ldflag) \
+   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+   -export-dynamic $(no_undefined)
+-- 
+1.8.3.2
+
diff --git a/dev-libs/glib/glib-2.34.3.ebuild b/dev-libs/glib/glib-2.34.3.ebuild
deleted file mode 100644
index b9cc634f9707..000000000000
--- a/dev-libs/glib/glib-2.34.3.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.7 2013/08/14 04:19:30 tetromino Exp $
-
-EAPI="5"
-PYTHON_DEPEND="utils? 2" # Avoid runtime dependency on python when USE=test
-
-inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="${SRC_URI}
-	http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="virtual/libiconv
-	virtual/libffi
-	sys-libs/zlib
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )
-	utils? ( >=dev-util/gdbus-codegen-${PV} )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		=dev-lang/python-2*
-		>=dev-util/gdbus-codegen-${PV}
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2"
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-pkg_setup() {
-	# Needed for gio/tests/gdbus-testserver.py
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
-
-	# Fix gmodule issues on fbsd; bug #184301
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch"
-
-	# bashcomp goes in /usr/share/bash-completion
-	epatch "${FILESDIR}/${PN}-2.32.4-bashcomp.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=679306
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=679308
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-gdbus-auth-tests.patch"
-
-	# build failure with automake-1.13; fixed upstream in 2.36
-	epatch "${FILESDIR}/${PN}-2.34.3-automake-1.13.patch"
-
-	epatch_user
-
-	# disable pyc compiling
-	use test && python_clean_py-compile_files
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	AT_M4DIR="${WORKDIR}" eautoreconf
-
-	[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	# -- compnerd (3/27/06)
-	use debug && myconf="--enable-debug"
-
-	if use test; then
-		myconf="${myconf} --enable-modular-tests"
-	else
-		if [[ ${PV} = 9999 ]] && use doc; then
-			# need to build tests if USE=doc for bug #387385
-			myconf="${myconf} --enable-modular-tests"
-		else
-			myconf="${myconf} --disable-modular-tests"
-		fi
-	fi
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		--enable-man \
-		--with-pcre=internal \
-		--with-threads=posix \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-}
-
-src_install() {
-	local f
-
-	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
-	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
-
-	if ! use utils; then
-		rm "${ED}usr/bin/gtester-report"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	dodoc AUTHORS ChangeLog* NEWS* README
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	prune_libtool_files --modules
-}
-
-src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_preinst() {
-	# Only give the introspection message if:
-	# * The user has gobject-introspection
-	# * Has glib already installed
-	# * Previous version was different from new version
-	# TODO: add a subslotted virtual to trigger this automatically
-	if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then
-		ewarn "You must rebuild gobject-introspection so that the installed"
-		ewarn "typelibs and girs are regenerated for the new APIs in glib"
-	fi
-}
-
-pkg_postinst() {
-	# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483
-	# TODO: add a subslotted virtual to trigger this automatically
-	if has_version dev-libs/dbus-glib; then
-		ewarn "If you experience a breakage after updating dev-libs/glib try"
-		ewarn "rebuilding dev-libs/dbus-glib"
-	fi
-
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.36.3-r1.ebuild b/dev-libs/glib/glib-2.36.3-r1.ebuild
deleted file mode 100644
index 4767fbea92b3..000000000000
--- a/dev-libs/glib/glib-2.36.3-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r1.ebuild,v 1.3 2013/08/14 04:19:30 tetromino Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_{5,6,7} )
-# Avoid runtime dependency on python when USE=test
-
-inherit autotools bash-completion-r1 gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs versionator virtualx linux-info
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="debug fam kernel_linux selinux static-libs systemtap test utils xattr"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	virtual/libiconv
-	virtual/libffi
-	sys-libs/zlib
-	|| (
-		>=dev-libs/elfutils-0.142
-		>=dev-libs/libelf-0.8.12
-		>=sys-freebsd/freebsd-lib-9.2_rc1
-		)
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	fam? ( virtual/fam )
-	utils? (
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-libs/libxslt-1.0
-	>=sys-devel/gettext-0.11
-	>=dev-util/gtk-doc-am-1.15
-	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? (
-		sys-devel/gdb
-		${PYTHON_DEPS}
-		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-		>=sys-apps/dbus-1.2.14 )
-	!<dev-libs/gobject-introspection-1.$(get_version_component_range 2)
-	!<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="x11-misc/shared-mime-info
-	!<gnome-base/gvfs-1.6.4-r990"
-# shared-mime-info needed for gio/xdgmime, bug #409481
-# Earlier versions of gvfs do not work with glib
-
-DOCS="AUTHORS ChangeLog* NEWS* README"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		CONFIG_CHECK="~INOTIFY_USER"
-		if use test; then
-			CONFIG_CHECK="~IPV6"
-			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
-			export IPV6_DISABLED="yes"
-		fi
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
-	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
-	if use test; then
-		# Do not try to remove files on live filesystem, upstream bug #619274
-		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
-			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
-		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
-		if ! has_version dev-util/desktop-file-utils ; then
-			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-			ewarn "think on installing it to get these tests run."
-			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-		fi
-
-		# gdesktopappinfo requires existing terminal (gnome-terminal or any
-		# other), falling back to xterm if one doesn't exist
-		if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
-			ewarn "Some tests will be skipped due to missing terminal program"
-			sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
-		fi
-
-		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
-		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
-			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
-			ewarn "not being present on your system, think on installing them to get these tests run."
-			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
-			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-			# needed to prevent gdbus-threading from asserting
-			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-		fi
-
-		# Some tests need ipv6, upstream bug #667468
-		if [[ -n "${IPV6_DISABLED}" ]]; then
-			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
-			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
-		fi
-
-		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
-		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-
-		# thread test fails, upstream bug #679306
-		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
-	fi
-
-	# gdbus-codegen is a separate package
-	epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
-
-	# leave python shebang alone
-	sed -e '/${PYTHON}/d' \
-		-i glib/Makefile.{am,in} || die
-
-	# Gentoo handles completions in a different directory
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		gio/Makefile.am || die
-
-	# Revert "g_file_set_contents(): don't fsync on ext3/4" (from 2.36 branch)
-	epatch "${FILESDIR}/${P}-revert-ext34.patch"
-
-	epatch_user
-
-	# Needed for the punt-python-check patch, disabling timeout test
-	# Also needed to prevent croscompile failures, see bug #267603
-	# Also needed for the no-gdbus-codegen patch
-	eautoreconf
-
-	# FIXME: Really needed when running eautoreconf before? bug#????
-	#[[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
-	epunt_cxx
-}
-
-src_configure() {
-	# Avoid circular depend with dev-util/pkgconfig and
-	# native builds (cross-compiles won't need pkg-config
-	# in the target ROOT to work here)
-	if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
-		if has_version sys-apps/dbus; then
-			export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
-			export DBUS1_LIBS="-ldbus-1"
-		fi
-		export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
-		export LIBFFI_LIBS="-lffi"
-	fi
-
-	local myconf
-
-	# Building with --disable-debug highly unrecommended.  It will build glib in
-	# an unusable form as it disables some commonly used API.  Please do not
-	# convert this to the use_enable form, as it results in a broken build.
-	use debug && myconf="--enable-debug"
-
-	# Always use internal libpcre, bug #254659
-	econf ${myconf} \
-		$(use_enable xattr) \
-		$(use_enable fam) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap dtrace) \
-		$(use_enable systemtap systemtap) \
-		$(use_enable test modular-tests) \
-		--enable-man \
-		--with-pcre=internal \
-		--with-threads=posix \
-		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
-}
-
-src_install() {
-	default
-
-	if use utils ; then
-		python_replicate_script "${ED}"/usr/bin/gtester-report
-	else
-		rm "${ED}usr/bin/gtester-report"
-		rm "${ED}usr/share/man/man1/gtester-report.1"
-	fi
-
-	# Do not install charset.alias even if generated, leave it to libiconv
-	rm -f "${ED}/usr/lib/charset.alias"
-
-	# Don't install gdb python macros, bug 291328
-	rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-
-	# Completely useless with or without USE static-libs, people need to use
-	# pkg-config
-	prune_libtool_files --modules
-}
-
-src_test() {
-	gnome2_environment_reset
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	export XDG_CONFIG_DIRS=/etc/xdg
-	export XDG_DATA_DIRS=/usr/local/share:/usr/share
-	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
-	unset GSETTINGS_BACKEND # bug 352451
-	export LC_TIME=C # bug #411967
-	python_export_best
-
-	# Related test is a bit nitpicking
-	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
-
-	# Hardened: gdb needs this, bug #338891
-	if host-is-pax ; then
-		pax-mark -mr "${S}"/tests/.libs/assert-msg-test \
-			|| die "Hardened adjustment failed"
-	fi
-
-	# Need X for dbus-launch session X11 initialization
-	Xemake check
-}
-
-pkg_postinst() {
-	if has_version '<x11-libs/gtk+-3.0.12:3'; then
-		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
-		# a warning instead of a blocker
-		ewarn
-		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
-		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
-	fi
-}
diff --git a/dev-libs/glib/glib-2.36.3-r2.ebuild b/dev-libs/glib/glib-2.36.4-r1.ebuild
similarity index 96%
rename from dev-libs/glib/glib-2.36.3-r2.ebuild
rename to dev-libs/glib/glib-2.36.4-r1.ebuild
index 6ad7d7010610..cd4f518d8609 100644
--- a/dev-libs/glib/glib-2.36.3-r2.ebuild
+++ b/dev-libs/glib/glib-2.36.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.3-r2.ebuild,v 1.5 2013/08/15 01:24:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.36.4-r1.ebuild,v 1.1 2013/09/02 18:29:07 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{5,6,7} )
@@ -136,6 +136,9 @@ src_prepare() {
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/${PN}-2.35.x-external-gdbus-codegen.patch"
 
+	# do not allow libgobject to unload; bug #405173, https://bugzilla.gnome.org/show_bug.cgi?id=707298
+	epatch "${FILESDIR}/${PN}-2.36.4-znodelete.patch"
+
 	# leave python shebang alone
 	sed -e '/${PYTHON}/d' \
 		-i glib/Makefile.{am,in} || die
@@ -144,9 +147,6 @@ src_prepare() {
 	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
 		gio/Makefile.am || die
 
-	# Revert "g_file_set_contents(): don't fsync on ext3/4" (from 2.36 branch)
-	epatch "${FILESDIR}/${P}-revert-ext34.patch"
-
 	epatch_user
 
 	# Needed for the punt-python-check patch, disabling timeout test
@@ -199,6 +199,7 @@ multilib_src_configure() {
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
 		$(use_enable test modular-tests) \
+		--disable-compile-warnings \
 		--enable-man \
 		--with-pcre=internal \
 		--with-threads=posix \
diff --git a/dev-ml/findlib/findlib-1.4.ebuild b/dev-ml/findlib/findlib-1.4.ebuild
index 102f952410d2..e19d4ae64e5f 100644
--- a/dev-ml/findlib/findlib-1.4.ebuild
+++ b/dev-ml/findlib/findlib-1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.7 2013/08/29 19:51:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/findlib/findlib-1.4.ebuild,v 1.8 2013/09/02 11:13:29 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/beaker/beaker-1.6.4-r1.ebuild b/dev-python/beaker/beaker-1.6.4-r1.ebuild
index 6351bd9e7815..91efee12669f 100644
--- a/dev-python/beaker/beaker-1.6.4-r1.ebuild
+++ b/dev-python/beaker/beaker-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.6.4-r1.ebuild,v 1.3 2013/09/01 15:00:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beaker/beaker-1.6.4-r1.ebuild,v 1.8 2013/09/02 12:10:42 ago Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 # webtest-based tests are skipped when webtest is not installed
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
index 9e394f209c5a..8f267cc7204d 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.4 2013/09/01 15:00:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.9 2013/09/02 12:11:44 ago Exp $
 
 EAPI="5"
 # A few tests fail with python3.3 :(
@@ -17,7 +17,7 @@ SRC_URI="http://www.crummy.com/software/${MY_PN}/download/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="python-3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
index 0dcc6726d825..887a276cdc20 100644
--- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.4 2013/09/01 15:00:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.9 2013/09/02 12:11:44 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} )
@@ -16,7 +16,7 @@ SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="python-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/bitstring/bitstring-3.1.1.ebuild b/dev-python/bitstring/bitstring-3.1.1.ebuild
index 7873c33d8423..ac2c0fe47e2a 100644
--- a/dev-python/bitstring/bitstring-3.1.1.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.3 2013/05/10 03:44:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.4 2013/09/02 18:38:26 floppym Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 inherit distutils-r1
 
 DESCRIPTION="A pure Python module for creation and analysis of binary data"
@@ -13,17 +13,18 @@ SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
+IUSE="test"
+DEPEND="app-arch/unzip
+	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 python_test() {
-	pushd test > /dev/null
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitarray       || die "test_bitarray failed"
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bits           || die "test_bits failed"
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstore       || die "test_bitstore failed"
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstream      || die "test_bitstream failed"
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstring      || die "test_bitstring failed"
-	PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_constbitstream || die "test_constbitstream failed"
-	popd > /dev/null
+	if [[ ${EPYTHON} == python2.6 ]]; then
+		local runner=( unit2.py )
+	else
+		local runner=( "${PYTHON}" -m unittest )
+	fi
+	pushd test > /dev/null || die
+	"${runner[@]}" discover || die "Testing failed with ${EPYTHON}"
+	popd test > /dev/null || die
 }
diff --git a/dev-python/bottle/bottle-0.11.6-r1.ebuild b/dev-python/bottle/bottle-0.11.6-r1.ebuild
index f5a10bf8a52f..5900614969c1 100644
--- a/dev-python/bottle/bottle-0.11.6-r1.ebuild
+++ b/dev-python/bottle/bottle-0.11.6-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6-r1.ebuild,v 1.3 2013/09/02 08:03:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.6-r1.ebuild,v 1.4 2013/09/02 18:26:20 dev-zero Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy{1_9,2_0})
-inherit distutils-r1 python-r1
+inherit distutils-r1
 
 DESCRIPTION="A fast and simple micro-framework for small web-applications"
 HOMEPAGE="http://pypi.python.org/pypi/bottle http://bottlepy.org/"
@@ -21,6 +21,7 @@ RDEPEND=""
 
 python_prepare_all() {
 	sed -i -e '/scripts/d' setup.py || die
+	distutils-r1_python_prepare_all
 }
 
 pkg_postinst() {
diff --git a/dev-python/cement/cement-2.0.2.ebuild b/dev-python/cement/cement-2.0.2.ebuild
index fa71db42db73..63b0b68735bb 100644
--- a/dev-python/cement/cement-2.0.2.ebuild
+++ b/dev-python/cement/cement-2.0.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.2 2013/05/10 04:28:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cement/cement-2.0.2.ebuild,v 1.3 2013/09/02 18:46:08 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
 
 inherit distutils-r1 versionator
 
-PV_MAJOR_MINOR=`get_version_component_range 1-2`
+PV_MAJOR_MINOR=$(get_version_component_range 1-2)
 
 DESCRIPTION="CLI Application Framework for Python"
 HOMEPAGE="http://builtoncement.com/"
@@ -36,7 +36,7 @@ python_test() {
 
 python_compile_all() {
 	if use doc; then
-		$PYTHON setup.py build_sphinx || die "couldn't build docs"
+		"${PYTHON}" setup.py build_sphinx || die "couldn't build docs"
 	fi
 }
 
diff --git a/dev-python/cssselect/cssselect-0.7.1-r1.ebuild b/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
index b68bc537f7ef..7a467b8200ff 100644
--- a/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
+++ b/dev-python/cssselect/cssselect-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1-r1.ebuild,v 1.3 2013/09/01 15:00:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssselect/cssselect-0.7.1-r1.ebuild,v 1.8 2013/09/02 12:11:48 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/d2to1/Manifest b/dev-python/d2to1/Manifest
index 109ecc0a84f4..2a97cff087fc 100644
--- a/dev-python/d2to1/Manifest
+++ b/dev-python/d2to1/Manifest
@@ -1,2 +1,2 @@
 DIST d2to1-0.2.10.tar.gz 41450 SHA256 90ed54749cdee1aab8daae720e3559dca97a47d071fa7f0592e75ffe869911e7 SHA512 5a932d56e1464b8d5f2fe212e2b9551251f90a9f9087b73d3d78525eeba6f696455db409b37490c94de8e9555be9bef893074de8ea628977f45200800be5f4f5 WHIRLPOOL 9c0d55268077dbbd89e4a07d5f5f823f66e892fc3669f95636fdfbfecd9598bf7ec01740882923edcd5c1027f946791e1d7b4f646874df4d3261d9ae359acc23
-DIST d2to1-0.2.9.tar.gz 37159 SHA256 f913e388aae7b7409cedffa51bc3ad19843a8bf6251227aa103857ef6db0c1c9 SHA512 12addbfbaa8cc392878758c7007ca6c61cd1aece68bc6692660b4affad4fb6773fa4c149a7eea17e2369b4063230087f6d4e4a6ba3538ced8e9f6ee67a0c9a4e WHIRLPOOL eb33078c579988f3bd685870f25cf48e35d8393c94b8d9648198b5d7b7aff1cf6ee18217526c4394b89689a49b10235656613984a99805a46e639d801994e26c
+DIST d2to1-0.2.11.tar.gz 25237 SHA256 64097a1b9270458898a0047034e9ba422a6456f51771105f33edb6b38e19bfa8 SHA512 46a8b8b154b77bbef7bfeeeba1d6752899fad1b4cac8a6df699d42c848dcccc51e16db6429d171efd829fd051215f58fd9a5ec2edb62a06cf75f00ec5faac4da WHIRLPOOL 88d71211a96523002892f8aa03abfdfd33b6859480898d8f0b68af5f1386976aa5563fbb0e15dfe588dab37d216fa74c7d990cb9ea4b61b7f53a9b8f7f5b99fe
diff --git a/dev-python/d2to1/d2to1-0.2.9.ebuild b/dev-python/d2to1/d2to1-0.2.11.ebuild
similarity index 60%
rename from dev-python/d2to1/d2to1-0.2.9.ebuild
rename to dev-python/d2to1/d2to1-0.2.11.ebuild
index 531d93049334..50c0970db533 100644
--- a/dev-python/d2to1/d2to1-0.2.9.ebuild
+++ b/dev-python/d2to1/d2to1-0.2.11.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.9.ebuild,v 1.1 2013/03/11 05:48:11 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/d2to1/d2to1-0.2.11.ebuild,v 1.1 2013/09/02 11:20:56 xarthisius Exp $
 
-EAPI=4
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
 
-inherit distutils
+inherit distutils-r1
 
 DESCRIPTION="Allows using distutils2-like setup.cfg files for a package metadata"
 HOMEPAGE="http://pypi.python.org/pypi/d2to1"
@@ -17,5 +17,5 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
-DEPEND="dev-python/setuptools"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/dev-python/deform/Manifest b/dev-python/deform/Manifest
index f66b7fc2c8da..1e4f739d0d8d 100644
--- a/dev-python/deform/Manifest
+++ b/dev-python/deform/Manifest
@@ -1,7 +1 @@
-DIST deform-0.9.2.tar.gz 645413 SHA256 51ce06ca2f9bad84225065875fbfc64b3e9d08d134fa164c09a1dc69be9be675 SHA512 91062f98d5cc45a529e7e0c3f37a56341128ea6d6f7ea904e8c99356daa56441085e764dfdad1ef34504f80bd3694766b710ed5cef337d1ad0b93460984e3390 WHIRLPOOL 89fcad716b676e60ae136624d38d4326eac28a76e4ec49c0196a94b28263af32abc5b32f45de1caa722a6983583b90aaa3112f2d47251c13452f1744f7bf17d3
-DIST deform-0.9.3.tar.gz 645749 SHA256 03241bfebf6a9987546ff735d86cd4d9155238411adb0347fce66f9684ed7d90 SHA512 6a14ad12ead4849045b20d3a4657d7407d6751ca731b212ccbee477f4bd00991a3be661da4b6c209489964e1b34278dbcf4f0962149ff00fcce8516200817e35 WHIRLPOOL 92a32921e0fcaa66806c4dfefc85bdacde2fbb331f8826b0a24bfbba2899f6467c99a25fe049776e62acd2c15188fe9ccae09152935b34095256c8307ec317f2
-DIST deform-0.9.4.tar.gz 654093 SHA256 d78f5dacf543d47fd22b88b50fb1829b3f4107b3c49d272834e6f405e2325358 SHA512 2342569442767ea353b363fa226fbe8e75147cc67f271654c105858f428a14db2059f7e8b194a90b2d07fe974afeff978d6da2078ad157477c4b7eb32dba30b5 WHIRLPOOL e2f492022bc42e57f3895f94bcbfe720dbcbe95a257326aca9b0c2e9fd31d4947945229903b299a465353461ad28cfba418325945eee41a433ad9b7c47f458b0
-DIST deform-0.9.5.tar.gz 1318541 SHA256 0cd23a9293f5a785d8b7537e1d256e3851f7eaf4ff091cf9994005ae4ec87b79 SHA512 90e4a3261dbeb4ebfac4915410198427c62ea989eef29adad84a19b09ec1ef2b3797f24b039a911c6c1d42b00350adf9662900738132249fff612c714542de08 WHIRLPOOL 4e8dc2555ce17ff8fdced735f2656b84987553d8c28c67d2519fe5ca008190c82bcd404dc76bc7717962d0c2ce511d043cfb29dc41feb635d0741c9cc4ee65be
-DIST deform-0.9.6.tar.gz 1334301 SHA256 3405b35e6b77a4d2acc3f213d65d9688ec6bb64a8d8ef070ccd55ffec576ef02 SHA512 eabf2d89aa56524f00e9fbc296714f26f64232477791deac57466db5a38d0e4cfceaab4509d9024b222f620f7d6e5bb34d2892290b139d30f350de79fce77e8f WHIRLPOOL 28370ab36f68a4ed54ec90bbc57376fe25c246860b93571c6b1831769d3127ff51049816728ed36bbdc93cab911b426cfc396aed2ace15d6b0fc9ff1005218b1
-DIST deform-0.9.7.tar.gz 1330099 SHA256 099cd4888275a8cd4a5e2724c296ecbd214cbd014d5fea017b6de2c29a4a1a9b SHA512 7f27494330dddf5c1611b731586c67b0a0b75436e895927f47e048954b6bb7280280533eef76a1628eff8d445aeb10c942e78ac2775f852fe42b3a65a63ce044 WHIRLPOOL 0a40718a0b4512fa277d7f4806dd5e4c206f605c8cee9f02d3b48a186e9e52a12c0b2b96a0f6269acf7c1f039cac9ce6b244f15a3abfeabff9825c243755a38a
 DIST deform-0.9.8.tar.gz 1336542 SHA256 fd4a4f216d939423a4fe5ef86ec9523b0f5f048cc37a7c9beed3d8316a06a094 SHA512 561fb7bdeefa848c2eeac3a36a13116409be0b9c90ef515fc9a3ac8f31e071767a155734a104ac261794caf35d0aacd434f243f19ffe4321fdabac3d9ccec789 WHIRLPOOL 4fd24743b0b01a279a193b6b24a4743d03c2bf7fa272f58953343e497f35fd1c835f3e0c9fd53ec9bdfdbe239d754ca927458b16696acc1b79c06c0fcc6f295e
diff --git a/dev-python/deform/deform-0.9.2.ebuild b/dev-python/deform/deform-0.9.2.ebuild
deleted file mode 100644
index 5e694b618354..000000000000
--- a/dev-python/deform/deform-0.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.2.ebuild,v 1.1 2011/07/30 02:12:48 rafaelmartins Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://pylonsproject.org/ http://pypi.python.org/pypi/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/translationstring
-	>=dev-python/colander-0.8
-	>=dev-python/peppercorn-0.3
-	>=dev-python/chameleon-1.2.3"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup )"
-
-# docs are broken
diff --git a/dev-python/deform/deform-0.9.3.ebuild b/dev-python/deform/deform-0.9.3.ebuild
deleted file mode 100644
index 2bd999a226da..000000000000
--- a/dev-python/deform/deform-0.9.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.3.ebuild,v 1.1 2012/02/08 02:56:49 patrick Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://pylonsproject.org/ http://pypi.python.org/pypi/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/translationstring
-	>=dev-python/colander-0.8
-	>=dev-python/peppercorn-0.3
-	>=dev-python/chameleon-1.2.3"
-
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup )"
-
-# docs are broken
diff --git a/dev-python/deform/deform-0.9.4.ebuild b/dev-python/deform/deform-0.9.4.ebuild
deleted file mode 100644
index 74eeb01f0cfa..000000000000
--- a/dev-python/deform/deform-0.9.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.4.ebuild,v 1.1 2012/02/23 00:31:45 marienz Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-0.9.6
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
-
-# The tests depend on beautifulsoup4, which is not currently packaged.
-# They will pass because setuptools downloads it from crummy.com
-# during the test phase. This is undesirable, so restrict the tests for now.
-# Revisit this in the future if beautifulsoup4 is packaged.
-DEPEND="${RDEPEND}"
-#	test? ( dev-python/beautifulsoup )"
-RESTRICT="test"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_install() {
-	distutils_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst
-}
diff --git a/dev-python/deform/deform-0.9.5.ebuild b/dev-python/deform/deform-0.9.5.ebuild
deleted file mode 100644
index e581187bca01..000000000000
--- a/dev-python/deform/deform-0.9.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.5.ebuild,v 1.2 2012/05/20 20:03:20 floppym Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-0.9.6
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4 )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_install() {
-	distutils_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst || die
-}
diff --git a/dev-python/deform/deform-0.9.6-r1.ebuild b/dev-python/deform/deform-0.9.6-r1.ebuild
deleted file mode 100644
index 29c156786f69..000000000000
--- a/dev-python/deform/deform-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.6-r1.ebuild,v 1.1 2013/01/31 09:45:18 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} python3_2 pypy{1_9,2_0} )
-inherit distutils-r1
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# tests require zope.deprecation
-RESTRICT="test"
-
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-1.0_alpha1
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4 )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst || die
-}
diff --git a/dev-python/deform/deform-0.9.6.ebuild b/dev-python/deform/deform-0.9.6.ebuild
deleted file mode 100644
index a244e7541b79..000000000000
--- a/dev-python/deform/deform-0.9.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.6.ebuild,v 1.2 2013/01/31 09:45:18 idella4 Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="2:2.6 3:3.2"
-RESTRICT_PYTHON_ABIS="2.5 3.0 3.1"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# tests require zope.deprecation
-RESTRICT="test"
-
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-1.0_alpha1
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4 )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS="CHANGES.txt COPYRIGHT.txt README.txt"
-
-src_install() {
-	distutils_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst || die
-}
diff --git a/dev-python/deform/deform-0.9.7.ebuild b/dev-python/deform/deform-0.9.7.ebuild
deleted file mode 100644
index 69cc2ba21b37..000000000000
--- a/dev-python/deform/deform-0.9.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.7.ebuild,v 1.1 2013/03/17 05:43:58 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} python3_2 pypy{1_9,2_0} )
-inherit distutils-r1
-
-DESCRIPTION="Another form generation library"
-HOMEPAGE="http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# tests require zope.deprecation
-RESTRICT="test"
-
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-1.0_alpha1
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
-DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4 )"
-
-# Include COPYRIGHT.txt because the license seems to require it.
-DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
-
-src_install() {
-	distutils-r1_src_install
-
-	# Install only the .rst source, as sphinx processing requires
-	# a theme only available from git that contains hardcoded
-	# references to files on https://static.pylonsproject.org/ (so
-	# the docs would not actually work offline). Install the
-	# source, which is somewhat readable.
-	docinto docs
-	dodoc docs/*.rst || die
-}
diff --git a/dev-python/deform/deform-0.9.8.ebuild b/dev-python/deform/deform-0.9.8.ebuild
index 221dbcb4ecb8..57891c58e68f 100644
--- a/dev-python/deform/deform-0.9.8.ebuild
+++ b/dev-python/deform/deform-0.9.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.8.ebuild,v 1.1 2013/09/02 06:49:59 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/deform/deform-0.9.8.ebuild,v 1.2 2013/09/02 19:07:27 floppym Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} python3_2 pypy{1_9,2_0} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy2_0 )
 inherit distutils-r1
 
 DESCRIPTION="Another form generation library"
@@ -18,13 +18,12 @@ IUSE="test"
 # tests require zope.deprecation
 RESTRICT="test"
 
-# Depend on peppercorn, translationstring and colander with Python 3 support
-RDEPEND=">=dev-python/translationstring-1.1
-	>=dev-python/colander-1.0_alpha1
-	>=dev-python/peppercorn-0.4
-	>=dev-python/chameleon-1.2.3"
+RDEPEND=">=dev-python/translationstring-1.1[${PYTHON_USEDEP}]
+	>=dev-python/colander-1.0_alpha1[${PYTHON_USEDEP}]
+	>=dev-python/peppercorn-0.4[${PYTHON_USEDEP}]
+	>=dev-python/chameleon-1.2.3[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? ( dev-python/beautifulsoup:4 )"
+	test? ( dev-python/beautifulsoup:4[${PYTHON_USEDEP}] )"
 
 # Include COPYRIGHT.txt because the license seems to require it.
 DOCS=( CHANGES.txt COPYRIGHT.txt README.txt )
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
index 2f85a4b5d4ad..c52d814b9665 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild,v 1.1 2013/06/04 07:06:16 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-3.2.6.ebuild,v 1.2 2013/09/02 16:36:57 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -27,6 +27,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
+
 python_test() {
 	local t
 
diff --git a/dev-python/jinja/jinja-2.6-r1.ebuild b/dev-python/jinja/jinja-2.6-r1.ebuild
index bbc3592fdf88..6e664bb3abed 100644
--- a/dev-python/jinja/jinja-2.6-r1.ebuild
+++ b/dev-python/jinja/jinja-2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r1.ebuild,v 1.7 2013/08/15 13:27:49 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r1.ebuild,v 1.12 2013/09/02 11:57:26 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
 RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja/jinja-2.6-r100.ebuild b/dev-python/jinja/jinja-2.6-r100.ebuild
index cea5455e8c00..de1099e37e41 100644
--- a/dev-python/jinja/jinja-2.6-r100.ebuild
+++ b/dev-python/jinja/jinja-2.6-r100.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r100.ebuild,v 1.8 2013/08/26 16:51:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r100.ebuild,v 1.14 2013/09/02 11:22:46 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="compat"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
 RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
diff --git a/dev-python/jinja/jinja-2.7.ebuild b/dev-python/jinja/jinja-2.7.ebuild
index 2dc5166fd12d..eed51c7ad233 100644
--- a/dev-python/jinja/jinja-2.7.ebuild
+++ b/dev-python/jinja/jinja-2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.ebuild,v 1.10 2013/08/24 23:33:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.7.ebuild,v 1.15 2013/09/02 11:22:08 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="doc examples"
 
 RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
diff --git a/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch b/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch
new file mode 100644
index 000000000000..019ce619ac6a
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.60.0-skip-doctest.patch
@@ -0,0 +1,13 @@
+http://www.logilab.org/ticket/174440
+diff --git a/textutils.py b/textutils.py
+--- a/textutils.py
++++ b/textutils.py
+@@ -287,7 +287,7 @@
+     >>> text_to_dict('''multiple=1
+     ... multiple= 2
+     ... single =3
+-    ... ''')
++    ... ''') # doctest: +SKIP
+     {'single': '3', 'multiple': ['1', '2']}
+ 
+     """
diff --git a/dev-python/logilab-common/logilab-common-0.60.0.ebuild b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
index de38e8b56a82..0dd4825530d8 100644
--- a/dev-python/logilab-common/logilab-common-0.60.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.60.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.60.0.ebuild,v 1.1 2013/08/10 10:00:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.60.0.ebuild,v 1.2 2013/09/02 17:31:51 floppym Exp $
 
 EAPI=5
-# broken with python3.3, bug #449276
+
+# 0.60.0 fails unittest_umessage with python3.3
+# http://www.logilab.org/ticket/149345
 PYTHON_COMPAT=( python{2_6,2_7,3_2} pypy{1_9,2_0} )
 
 inherit distutils-r1 eutils
@@ -26,7 +28,7 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 # Python2 only.
 DEPEND="${RDEPEND}
 	test? (
-		dev-python/egenix-mx-base[$(python_gen_usedep 'python2*')]
+		$(python_gen_cond_dep dev-python/egenix-mx-base[$(python_gen_usedep 'python2*')] 'python2*')
 		!dev-python/psycopg[-mxdatetime]
 	)
 	doc? ( dev-python/epydoc )"
@@ -35,6 +37,9 @@ PATCHES=(
 	# Make sure setuptools does not create a zip file in python_test;
 	# this is buggy and causes tests to fail.
 	"${FILESDIR}/${PN}-0.59.1-zipsafe.patch"
+
+	# Depends on order of dictionary keys
+	"${FILESDIR}/logilab-common-0.60.0-skip-doctest.patch"
 )
 
 python_prepare_all() {
diff --git a/dev-python/lxml/lxml-3.2.1.ebuild b/dev-python/lxml/lxml-3.2.1.ebuild
index 07f6318505a7..3fef9d6ccca7 100644
--- a/dev-python/lxml/lxml-3.2.1.ebuild
+++ b/dev-python/lxml/lxml-3.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.6 2013/09/01 15:00:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.11 2013/09/02 12:11:40 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="beautifulsoup3 doc examples +threads"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/mako/mako-0.7.3-r1.ebuild b/dev-python/mako/mako-0.7.3-r1.ebuild
index 9eb084203f78..3d56f3103405 100644
--- a/dev-python/mako/mako-0.7.3-r1.ebuild
+++ b/dev-python/mako/mako-0.7.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1998-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r1.ebuild,v 1.3 2013/09/01 15:00:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r1.ebuild,v 1.8 2013/09/02 12:10:39 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.makotemplates.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/beaker-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild b/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
index 9d76e3b0190d..4c6430a4b92c 100644
--- a/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
+++ b/dev-python/markupsafe/markupsafe-0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15-r1.ebuild,v 1.9 2013/08/10 13:29:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/markupsafe/markupsafe-0.15-r1.ebuild,v 1.14 2013/09/02 11:22:01 ago Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ordereddict/Manifest b/dev-python/ordereddict/Manifest
new file mode 100644
index 000000000000..c0972ec575a2
--- /dev/null
+++ b/dev-python/ordereddict/Manifest
@@ -0,0 +1 @@
+DIST ordereddict-1.1.tar.gz 2114 SHA256 1c35b4ac206cef2d24816c89f89cf289dd3d38cf7c449bb3fab7bf6d43f01b1f SHA512 20b2beb1ee6309885b2d702c04d21e683fae3061f19176aceae381688be0fed5b2fbf55a1ff901460e93bf14c83169d2b7a286e3725b008583711134656d86e5 WHIRLPOOL 228d1a6a1926d7c1decc892c53d6260e78af0a32fcee2e04ce46a828648a2fcba16ba637b78cd30f903224baadb1ad78b232d0b8f7d68d0bc8c10daebb8ed86c
diff --git a/dev-python/ordereddict/metadata.xml b/dev-python/ordereddict/metadata.xml
new file mode 100644
index 000000000000..301d2207cc29
--- /dev/null
+++ b/dev-python/ordereddict/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+</pkgmetadata>
diff --git a/dev-python/ordereddict/ordereddict-1.1.ebuild b/dev-python/ordereddict/ordereddict-1.1.ebuild
new file mode 100644
index 000000000000..e831390d4a84
--- /dev/null
+++ b/dev-python/ordereddict/ordereddict-1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ordereddict/ordereddict-1.1.ebuild,v 1.1 2013/09/02 16:05:01 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="A drop-in substitute for Py2.7's new collections.OrderedDict"
+HOMEPAGE="https://pypi.python.org/pypi/ordereddict"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
index f5ca78a67dcd..2cb755dd8116 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.7 2013/08/29 19:52:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.8 2013/09/02 11:12:34 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl"
 
 # Depend on a curl with curl_ssl_* USE flags.
diff --git a/dev-python/pyquery/pyquery-1.2.4.ebuild b/dev-python/pyquery/pyquery-1.2.4.ebuild
index 28d7a1653fd0..ce293279a08e 100644
--- a/dev-python/pyquery/pyquery-1.2.4.ebuild
+++ b/dev-python/pyquery/pyquery-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.4.ebuild,v 1.8 2013/09/01 15:00:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyquery/pyquery-1.2.4.ebuild,v 1.13 2013/09/02 12:11:28 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="beautifulsoup3 test"
 
 RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}]
diff --git a/dev-python/python-slip/python-slip-0.2.21.ebuild b/dev-python/python-slip/python-slip-0.2.21.ebuild
deleted file mode 100644
index 63910c5ee8fd..000000000000
--- a/dev-python/python-slip/python-slip-0.2.21.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-slip/python-slip-0.2.21.ebuild,v 1.4 2013/04/06 13:12:26 swift Exp $
-
-EAPI=4
-
-# pygtk, pygobject:2 etc. don't support multiple python2 slots
-PYTHON_COMPAT="python2_7"
-
-inherit eutils python-distutils-ng
-
-DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python"
-HOMEPAGE="https://fedorahosted.org/python-slip/"
-SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gtk selinux"
-
-RDEPEND="
-	dbus? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-		sys-auth/polkit )
-	gtk? ( dev-python/pygtk:2 )
-"
-DEPEND=""
-
-python_prepare_all() {
-	use selinux || epatch "${FILESDIR}/${PN}-0.2.20-no-selinux.patch"
-	sed -e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die "sed failed"
-
-	if ! use dbus; then
-		sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n    \1/' \
-			-i setup.py || die "sed 2 failed"
-	fi
-	if ! use gtk; then
-		sed -e '/name="slip.gtk"/ s/\(.*\)/if 0:\n    \1/' \
-			-i setup.py || die "sed 3 failed"
-	fi
-}
diff --git a/dev-python/sphinx/sphinx-1.1.3-r6.ebuild b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
index 69ce98797133..44da29b0b273 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r6.ebuild,v 1.8 2013/08/15 13:28:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r6.ebuild,v 1.13 2013/09/02 11:57:22 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc latex test"
 
 RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
index 1f22e384aa8c..5a192d9c6a3b 100644
--- a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
+++ b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.6 2013/08/26 16:56:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.12 2013/09/02 11:59:59 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc latex test"
 
 # Split the jinja dep to allow different slots to satisfy it
diff --git a/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild b/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
index 0c4b0fd0e92f..29cf8533ccbb 100644
--- a/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.1 2013/07/08 05:51:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlalchemy/sqlalchemy-0.8.2.ebuild,v 1.3 2013/09/02 17:44:56 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_2,3_3} pypy{1_9,2_0} )
@@ -42,18 +42,19 @@ python_prepare() {
 	fi
 }
 
-python_configure() {
-	if [[ "${EPYTHON}" != python3* ]]; then
-		append-flags -fno-strict-aliasing
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS=${CFLAGS}
+		append-cflags -fno-strict-aliasing
 	fi
+	distutils-r1_python_compile
 }
 
 python_test() {
-	local DISTUTILS_NO_PARALLEL_BUILD=1
-	# No longer has postgresql support
-	if [[ "${EPYTHON}" == python3* ]]; then
+	if python_is_python3; then
 		"${PYTHON}" sa2to3.py --no-diffs -w lib test examples
 	fi
+	# No longer has postgresql support
 	"${PYTHON}" sqla_nose.py -I test_postgresql || die "Testsuite failed under ${EPYTHON}"
 }
 
diff --git a/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
index 2112458862f5..5525ad46d165 100644
--- a/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild,v 1.12 2013/08/26 00:27:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenv/virtualenv-1.9.1-r1.ebuild,v 1.17 2013/09/02 11:57:18 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv"
 SRC_URI="https://github.com/pypa/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-python/webob/webob-1.2.3-r1.ebuild b/dev-python/webob/webob-1.2.3-r1.ebuild
index 39397a8e1d52..2766ca84bdf2 100644
--- a/dev-python/webob/webob-1.2.3-r1.ebuild
+++ b/dev-python/webob/webob-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.2.3-r1.ebuild,v 1.5 2013/09/01 15:00:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.2.3-r1.ebuild,v 1.10 2013/09/02 12:10:59 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/webtest/webtest-1.4.3-r1.ebuild b/dev-python/webtest/webtest-1.4.3-r1.ebuild
index 733abf996151..073a4f75e386 100644
--- a/dev-python/webtest/webtest-1.4.3-r1.ebuild
+++ b/dev-python/webtest/webtest-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.4.3-r1.ebuild,v 1.3 2013/09/01 15:00:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-1.4.3-r1.ebuild,v 1.8 2013/09/02 12:10:47 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="doc test"
 
 RDEPEND=">=dev-python/webob-0.9.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/webtest/webtest-2.0.7.ebuild b/dev-python/webtest/webtest-2.0.7-r1.ebuild
similarity index 80%
rename from dev-python/webtest/webtest-2.0.7.ebuild
rename to dev-python/webtest/webtest-2.0.7-r1.ebuild
index 70350b8b97a3..e705b9899908 100644
--- a/dev-python/webtest/webtest-2.0.7.ebuild
+++ b/dev-python/webtest/webtest-2.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.7.ebuild,v 1.1 2013/08/10 12:42:49 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webtest/webtest-2.0.7-r1.ebuild,v 1.1 2013/09/02 16:13:15 floppym Exp $
 
 EAPI=5
 
@@ -8,7 +8,6 @@ EAPI=5
 RESTRICT="test"
 
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
 
 inherit distutils-r1
 
@@ -24,14 +23,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/webob-0.9.2[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+	>=dev-python/webob-0.9.2[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	python_targets_python2_6? ( dev-python/ordereddict[python_targets_python2_6] )
+"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/waitress[${PYTHON_USEDEP}]
 		dev-python/wsgiproxy2[${PYTHON_USEDEP}]
 		dev-python/paste
 		dev-python/pastedeploy )"
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
index 14ef4dbf5756..943606bf804e 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.6 2013/08/29 19:53:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/RubyInline/RubyInline-3.12.2.ebuild,v 1.7 2013/09/02 11:11:59 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend dev-ruby/zentest
diff --git a/dev-ruby/json/json-1.8.0-r1.ebuild b/dev-ruby/json/json-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..548202dad1c7
--- /dev/null
+++ b/dev-ruby/json/json-1.8.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.8.0-r1.ebuild,v 1.1 2013/09/02 17:54:41 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension."
+HOMEPAGE="http://json.rubyforge.org/"
+LICENSE="|| ( Ruby GPL-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e 's| => :compile||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+
+	# Remove hardcoded and broken -O setting.
+	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
+		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
+}
+
+each_ruby_compile() {
+	# Since 1.5.0 a Java extension is provided but it does not compile.
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		${RUBY} -S rake compile || die "extension compile failed"
+	fi
+}
+
+each_ruby_test() {
+	JSON=pure \
+	${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed"
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
+		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
+	fi
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
index 25cf68bac9cc..aced766b48d1 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild,v 1.9 2013/08/29 19:47:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gdbus-codegen/gdbus-codegen-2.32.4-r1.ebuild,v 1.10 2013/09/02 11:13:17 ago Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="glib"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/gnome-base/gdm/gdm-3.6.2-r1.ebuild b/gnome-base/gdm/gdm-3.6.2-r1.ebuild
index 47089d82624c..65d3d5259434 100644
--- a/gnome-base/gdm/gdm-3.6.2-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.6.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild,v 1.1 2013/05/20 11:52:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2-r1.ebuild,v 1.2 2013/09/02 16:40:26 tetromino Exp $
 
 EAPI="5"
 GNOME2_LA_PUNT="yes"
@@ -56,7 +56,7 @@ COMMON_DEPEND="
 
 	accessibility? ( x11-libs/libXevie )
 	audit? ( sys-process/audit )
-	consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] )
+	consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	plymouth? ( sys-boot/plymouth )
 	selinux? ( sys-libs/libselinux )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
index c460ddd9bfc6..a448ac3d841b 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.8 2013/09/02 08:12:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.6.8.ebuild,v 1.9 2013/09/02 11:14:33 ago Exp $
 
 EAPI=5
 inherit multilib toolchain-funcs versionator libtool flag-o-matic eutils
@@ -13,7 +13,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 
 LICENSE="imagemagick"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
diff --git a/media-gfx/llgal/Manifest b/media-gfx/llgal/Manifest
index 3a97ba2dd7a4..ca7e365d2e54 100644
--- a/media-gfx/llgal/Manifest
+++ b/media-gfx/llgal/Manifest
@@ -1,3 +1,2 @@
-DIST llgal-0.13.15.tar.bz2 79719 RMD160 83fd39630c4d2eecefeaa6c67321dae26470529c SHA1 8a9c722ee03f6b0b37a4d5e97dc9e30a0ccba530 SHA256 bbf0451ea556130b37223278ffdda7ad61be6d7dbdaffee2f7916c94b497e8aa
-DIST llgal-0.13.16.tar.bz2 80802 RMD160 55ee19cf3bc1289834785b1cc86400eb061ccb9d SHA1 14d396a57c58193c346abbb0558444a21608b232 SHA256 58cfbf05b29b2bb111e8722f792bbc789eb9351ccf6d8bc84888e7f6f9a3f658
-DIST llgal-0.13.17.tar.bz2 81365 RMD160 8628d0dc3251b1e9860c18dea80582b2082f6b33 SHA1 1d0cf773bb76b6e5155c8e27b1527d41578eb4a9 SHA256 86c8a35ec3387ecfb69d3695611f384ce6cf4189ded02668c59c9e35e00390ce
+DIST llgal-0.13.15.tar.bz2 79719 SHA256 bbf0451ea556130b37223278ffdda7ad61be6d7dbdaffee2f7916c94b497e8aa
+DIST llgal-0.13.17.tar.bz2 81365 SHA256 86c8a35ec3387ecfb69d3695611f384ce6cf4189ded02668c59c9e35e00390ce SHA512 2b100053a804985e7f59674e6a0886bffe5231cf3735a8dbbf7c8db56285a5a4ca88880299aac25d5cecb6a4f0cc024dc87fdf084eb281f7cb578f0d7cba5293 WHIRLPOOL 216b7dc933f72a0419579b71884f5e9e7084e0f5e1427d5d66b432adad108eb648c0d4a61c62d8ab5dbba0aa7ca0b3b4b3df4814f99aaec0271276c32b62f109
diff --git a/media-gfx/llgal/llgal-0.13.16.ebuild b/media-gfx/llgal/llgal-0.13.16.ebuild
deleted file mode 100644
index d5b932a4efe1..000000000000
--- a/media-gfx/llgal/llgal-0.13.16.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/llgal/llgal-0.13.16.ebuild,v 1.2 2012/02/06 19:46:23 armin76 Exp $
-
-inherit perl-module
-
-DESCRIPTION="Command-line static web gallery generator"
-HOMEPAGE="http://home.gna.org/llgal"
-SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="exif"
-
-LINS="de en it fr"
-for i in ${LINS}; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND="media-gfx/imagemagick
-	 dev-lang/perl
-	 dev-perl/ImageSize
-	 dev-perl/URI
-	 dev-perl/Locale-gettext
-	 exif? ( media-libs/exiftool )"
-
-src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man \
-	PERL_INSTALLDIRS=vendor || die "Failed to compile"
-}
-
-src_install() {
-	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
-		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/ \
-		|| die "Failed to install"
-	fixlocalpod
-	dodoc Changes
-}
diff --git a/media-gfx/llgal/llgal-0.13.17.ebuild b/media-gfx/llgal/llgal-0.13.17-r1.ebuild
similarity index 67%
rename from media-gfx/llgal/llgal-0.13.17.ebuild
rename to media-gfx/llgal/llgal-0.13.17-r1.ebuild
index c70ff1abaf4b..7ec31683a80d 100644
--- a/media-gfx/llgal/llgal-0.13.17.ebuild
+++ b/media-gfx/llgal/llgal-0.13.17-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/llgal/llgal-0.13.17.ebuild,v 1.2 2012/02/06 19:46:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/llgal/llgal-0.13.17-r1.ebuild,v 1.1 2013/09/02 14:17:56 idella4 Exp $
+
+EAPI=5
 
 inherit perl-module
 
@@ -11,6 +13,7 @@ SRC_URI="http://download.gna.org/llgal/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+# Package warrants IUSE doc and possibly examples
 IUSE="exif"
 
 LINS="de en it fr"
@@ -19,22 +22,20 @@ for i in ${LINS}; do
 done
 
 RDEPEND="media-gfx/imagemagick
-	 dev-lang/perl
 	 dev-perl/ImageSize
 	 dev-perl/URI
 	 dev-perl/Locale-gettext
 	 exif? ( media-libs/exiftool )"
 
 src_compile() {
-	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man \
-	PERL_INSTALLDIRS=vendor || die "Failed to compile"
+	emake PREFIX=/usr SYSCONFDIR=/etc MANDIR=/usr/share/man PERL_INSTALLDIRS=vendor
+	mv doc/llgalrc . || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" LOCALES="${LINGUAS}" PREFIX=/usr SYSCONFDIR=/etc \
 		PERL_INSTALLDIRS=vendor MANDIR=/usr/share/man \
-		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/ \
-		|| die "Failed to install"
+		install install-doc install-man DOCDIR=/usr/share/doc/${PF}/html/
 	fixlocalpod
-	dodoc Changes
+	dodoc README llgalrc llgalrc.5
 }
diff --git a/media-libs/fontconfig/fontconfig-2.10.92.ebuild b/media-libs/fontconfig/fontconfig-2.10.92.ebuild
index 2166ecaa86b7..013f960864d2 100644
--- a/media-libs/fontconfig/fontconfig-2.10.92.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.10.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.92.ebuild,v 1.9 2013/08/29 19:48:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.10.92.ebuild,v 1.10 2013/09/02 11:13:54 ago Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=yes
@@ -13,7 +13,7 @@ SRC_URI="http://fontconfig.org/release/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="doc static-libs"
 
 # Purposefully dropped the xml USE flag and libxml2 support.  Expat is the
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 263ce1d6eccd..8d0d7db46187 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,3 @@
 DIST harfbuzz-0.9.12.tar.bz2 886353 SHA256 c653f70a275e98d109a9f1271373a6e80978c97298d723cb3f370351852f9da5 SHA512 10c0e174789e36a02e616cf922962a7c75d6f89cb378a33487b81947e16818347c888c39703c64d620eb3d29bf90cd900ae832dd573f5081eb4de25ba4737bff WHIRLPOOL 6228766b74a46482811ce0e4c85b6bd80d4c0e37aaade3c2b75b790ed1409255d481688e0def89b75a9a1df3ef10bab221dce105439a433e5b33e65ac8685c63
-DIST harfbuzz-0.9.17.tar.bz2 902229 SHA256 a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed SHA512 0d10ba7075338b912f19a1a26d64502b772f5574a45fb43d92eaa56434cf5d2a844f23897ecb0abbdd26e1a0aec5f6ded7e533451ee6e4a03725f42aed7f9bcd WHIRLPOOL 8bb7f0b30aaf632b7bf4df4f62a05d321f0715b8f2de79047a1ed044fb5e825c8d524e825576c7d3b361dabf16658e480fcb5365dc52959cff6bb509f1777f15
 DIST harfbuzz-0.9.18.tar.bz2 902395 SHA256 fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908 SHA512 cf873e903b620391efbd681a01620f1719d278bf10a61a8f583abb9ba116ec494459cef1f81f137cf2dbb089c9d6a8460576ccabd46ab3f23a50e3731b427f5d WHIRLPOOL 57ecc5fdb9ed879113fac335aa3a222963183832257a58944c561e671e3d514bde462a323b776184d10b2bfe1abc9151c93cff8d9098abedcfa03415708a0fea
+DIST harfbuzz-0.9.20.tar.bz2 1030152 SHA256 83384fa03fbcf0c5d8203374bae2efef7dcac650f428d2216d8a6d2251dbbc67 SHA512 2473885cf77f2353a28779f55aa5eb323190fd5432d2bba0026a0b337986d293e8a38d7a5bd6c68e7bc3843e6ad3ed3a592d12b896fc28ff7119c67a8c7d6f45 WHIRLPOOL 0a35408913a042a3055f30b743d4e278b903254e762a6daa37f8955aa9907480b670120a6520e7b2487cfcc00959d43930c845293d8a674826fe90f8c2d3f18f
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild
deleted file mode 100644
index 8ee5ba2dcbcc..000000000000
--- a/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.17.ebuild,v 1.1 2013/05/21 10:31:14 scarabeus Exp $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
-[[ ${PV} == 9999 ]] && inherit git-2 autotools
-
-inherit eutils libtool
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/icu:=
-	media-gfx/graphite2:=
-	media-libs/freetype:2=
-	x11-libs/cairo:=
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# on Darwin we need to link with g++, like automake defaults to,
-		# but overridden by upstream because on Linux this is not
-		# necessary, bug #449126
-		sed -i \
-			-e 's/\<LINK\>/CXXLINK/' \
-			src/Makefile.am || die
-		sed -i \
-			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-			src/Makefile.in || die
-	fi
-	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize  # for building a shared library on x64-solaris
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
new file mode 100644
index 000000000000..445997546f58
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-0.9.20.ebuild,v 1.1 2013/09/02 19:28:22 tetromino Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-2 autotools
+
+inherit eutils libtool autotools
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
+# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
+IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+	cairo? ( x11-libs/cairo:= )
+	glib? ( dev-libs/glib:2 )
+	graphite? ( media-gfx/graphite2:= )
+	icu? ( dev-libs/icu:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/gtk-doc-am
+	dev-util/ragel
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
+		# necessary, bug #449126
+		sed -i \
+			-e 's/\<LINK\>/CXXLINK/' \
+			src/Makefile.am || die
+		sed -i \
+			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+			src/Makefile.in || die
+	fi
+
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-coretext \
+		--without-uniscribe \
+		$(use_enable static-libs static) \
+		$(use_with cairo) \
+		$(use_with glib) \
+		$(use_with glib gobject) \
+		$(use_with graphite graphite2) \
+		$(use_with icu) \
+		$(use_enable introspection) \
+		$(use_with truetype freetype)
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index dd7e4cf2281c..5ea7ec16ccf6 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.15 2013/06/06 05:23:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/harfbuzz/harfbuzz-9999.ebuild,v 1.16 2013/09/02 19:28:22 tetromino Exp $
 
 EAPI=5
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
 [[ ${PV} == 9999 ]] && inherit git-2 autotools
 
-inherit eutils libtool
+inherit eutils libtool autotools
 
 DESCRIPTION="An OpenType text shaping engine"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -17,24 +17,29 @@ LICENSE="Old-MIT ISC icu"
 SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris"
-IUSE="+cairo +glib +graphite icu static-libs +truetype"
+# TODO: +introspection when it's closer to finished and useful (0.9.21 hopefully)
+IUSE="+cairo +glib +graphite icu introspection static-libs +truetype"
+REQUIRED_USE="introspection? ( glib )"
 
 RDEPEND="
 	cairo? ( x11-libs/cairo:= )
 	glib? ( dev-libs/glib:2 )
 	graphite? ( media-gfx/graphite2:= )
 	icu? ( dev-libs/icu:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
 	truetype? ( media-libs/freetype:2= )
 "
 DEPEND="${RDEPEND}
+	>=dev-libs/gobject-introspection-common-1.32
+	dev-util/gtk-doc-am
 	dev-util/ragel
 	virtual/pkgconfig
 "
 
 src_prepare() {
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# on Darwin we need to link with g++, like automake defaults to,
-		# but overridden by upstream because on Linux this is not
+	if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+		# on Darwin/Solaris we need to link with g++, like automake defaults
+		# to, but overridden by upstream because on Linux this is not
 		# necessary, bug #449126
 		sed -i \
 			-e 's/\<LINK\>/CXXLINK/' \
@@ -43,8 +48,8 @@ src_prepare() {
 			-e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
 			src/Makefile.in || die
 	fi
+
 	[[ ${PV} == 9999 ]] && eautoreconf
-	elibtoolize  # for building a shared library on x64-solaris
 }
 
 src_configure() {
@@ -54,10 +59,11 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_with cairo) \
 		$(use_with glib) \
+		$(use_with glib gobject) \
 		$(use_with graphite graphite2) \
 		$(use_with icu) \
+		$(use_enable introspection) \
 		$(use_with truetype freetype)
-
 }
 
 src_install() {
diff --git a/media-sound/lltag/Manifest b/media-sound/lltag/Manifest
index e920b7482a88..c952fce0c1a5 100644
--- a/media-sound/lltag/Manifest
+++ b/media-sound/lltag/Manifest
@@ -1,3 +1,2 @@
-DIST lltag-0.14.2.tar.bz2 47227 RMD160 d7333c81f06c42609060b1d875ffc0e56389305c SHA1 99484f3ac35b5a02649b90a40cee22ebe82bea17 SHA256 b7c18ee52fe77b3b7cf6a40f4f3a1506d9e95b5b6236902b1deaa9329cb0e9c1
-DIST lltag-0.14.3.tar.bz2 48085 RMD160 05d31e5e82b21ebbc3d945633dc2161cbbe3d4a8 SHA1 fd7cbf62227c7f2cb15a328b157b42f905ba5ef5 SHA256 62d9cd8d94dea503424c1b63d216f5b8140aea2be0653e01496999330807cd2f
-DIST lltag-0.14.4.tar.bz2 48137 RMD160 78a3271cb744a88f447eb0b327062e35a2340bc2 SHA1 d6f1ecb5513bb9e7ebb18b3dfc2ff89e1813ae65 SHA256 5fe8d993289136395eb040ac6f1fa633cd8fd6a02a39de2db6f0ff1397ec948d
+DIST lltag-0.14.2.tar.bz2 47227 SHA256 b7c18ee52fe77b3b7cf6a40f4f3a1506d9e95b5b6236902b1deaa9329cb0e9c1
+DIST lltag-0.14.4.tar.bz2 48137 SHA256 5fe8d993289136395eb040ac6f1fa633cd8fd6a02a39de2db6f0ff1397ec948d SHA512 d2dbc513ce5e75a808acb7676a2513ece34322d134d52e1f5ea44f51b7c134699a0a8e368265c2594fd275873e4908a21af135c8714278954d0b45f2fc239bf7 WHIRLPOOL 62caf3b3e5fc05dd081cf4323b1b90e302306feee4a42c3a8a7e92703cbf08986f82b8f8a5d3faf4a13f69e59d4148a35b1b0c507e1284285ed6cc9893298dbb
diff --git a/media-sound/lltag/lltag-0.14.3.ebuild b/media-sound/lltag/lltag-0.14.3.ebuild
deleted file mode 100644
index 836e3db8028e..000000000000
--- a/media-sound/lltag/lltag-0.14.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lltag/lltag-0.14.3.ebuild,v 1.1 2010/07/29 23:48:43 ssuominen Exp $
-
-EAPI=2
-inherit perl-module
-
-DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
-HOMEPAGE="http://home.gna.org/lltag"
-SRC_URI="http://download.gna.org/lltag/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="flac mp3 ogg readline"
-
-RDEPEND="dev-lang/perl
-	dev-perl/libwww-perl
-	mp3? ( || ( media-sound/mp3info dev-perl/MP3-Tag ) )
-	ogg? ( media-sound/vorbis-tools )
-	flac? ( media-libs/flac )
-	readline? ( dev-perl/Term-ReadLine-Perl )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	mylltagopts=(
-		"DESTDIR=${D}"
-		"PREFIX=/usr"
-		"SYSCONFDIR=/etc"
-		"MANDIR=/usr/share/man"
-		"PERL_INSTALLDIRS=vendor"
-		"DOCDIR=/usr/share/doc/${PF}"
-		)
-}
-
-src_compile() {
-	emake "${mylltagopts[@]}" || die
-}
-
-src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man} || die
-	dodoc Changes
-	fixlocalpod
-}
diff --git a/media-sound/lltag/lltag-0.14.4.ebuild b/media-sound/lltag/lltag-0.14.4-r1.ebuild
similarity index 72%
rename from media-sound/lltag/lltag-0.14.4.ebuild
rename to media-sound/lltag/lltag-0.14.4-r1.ebuild
index 19f04a00faff..8e31857e0654 100644
--- a/media-sound/lltag/lltag-0.14.4.ebuild
+++ b/media-sound/lltag/lltag-0.14.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lltag/lltag-0.14.4.ebuild,v 1.2 2011/08/06 19:13:59 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lltag/lltag-0.14.4-r1.ebuild,v 1.1 2013/09/02 14:52:08 idella4 Exp $
 
-EAPI=2
+EAPI=5
 inherit perl-module
 
 DESCRIPTION="Automatic command-line mp3/ogg/flac file tagger and renamer"
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="flac mp3 ogg readline"
 
-RDEPEND="dev-lang/perl
-	dev-perl/libwww-perl
+RDEPEND="dev-perl/libwww-perl
 	mp3? ( media-sound/mp3info dev-perl/MP3-Tag )
 	ogg? ( media-sound/vorbis-tools )
 	flac? ( media-libs/flac )
@@ -34,11 +33,13 @@ pkg_setup() {
 }
 
 src_compile() {
-	emake "${mylltagopts[@]}" || die
+	emake "${mylltagopts[@]}"
 }
 
 src_install() {
-	emake "${mylltagopts[@]}" install{,-doc,-man} || die
+	emake "${mylltagopts[@]}" install{,-doc,-man}
 	dodoc Changes
 	fixlocalpod
+	# Move config to recommended location
+	mv "${D}usr/share/doc/${PF}"/config "${D}"etc/lltag/ || die
 }
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 66302f793406..527d303c2de5 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-	<email>nikoli@lavabit.com</email>
+	<email>nikoli@gmx.us</email>
 </maintainer>
 <herd>video</herd>
 <herd>proxy-maintainers</herd>
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 7ab980b5cddf..e385261561f6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Sep 2013 09:37:00 +0000
+Mon, 02 Sep 2013 20:06:57 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7ab980b5cddf..e385261561f6 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Sep 2013 09:37:00 +0000
+Mon, 02 Sep 2013 20:06:57 +0000
diff --git a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2 b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
index 6943b375b008..abaddbffd372 100644
--- a/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
+++ b/metadata/md5-cache/app-admin/gkrellm-2.3.5-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Single process stack of various system monitors
 EAPI=4
 HOMEPAGE=http://www.gkrellm.net/
 IUSE=hddtemp gnutls lm_sensors nls ssl ntlm X kernel_FreeBSD
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 hddtemp? ( app-admin/hddtemp ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( virtual/libintl ) ntlm? ( net-libs/libntlm ) X? ( x11-libs/gtk+:2 )
 SLOT=2
 SRC_URI=http://members.dslextreme.com/users/billw/gkrellm/gkrellm-2.3.5.tar.bz2
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cbcfec9024a856c09a2a6dcb564e5f4b
+_md5_=faeaea3f5e33868818fb051556738beb
diff --git a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r6 b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r6
index 82f48c6ea914..e07bafa42472 100644
--- a/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r6
+++ b/metadata/md5-cache/app-admin/hddtemp-0.3_beta15-r6
@@ -3,9 +3,9 @@ DEPEND=|| ( >=sys-devel/automake-1.12 >=sys-devel/automake-1.13 ) >=sys-devel/au
 DESCRIPTION=A simple utility to read the temperature of SMART capable hard drives
 HOMEPAGE=http://savannah.nongnu.org/projects/hddtemp/
 IUSE=nls
-KEYWORDS=~alpha amd64 arm hppa ia64 ppc ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ppc ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cd0b2c3c7cb984d33006780d006b4c3e
+_md5_=106d986fe707bb990f6fdd3f0a61da68
diff --git a/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1 b/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1
index 42a0fbbaac5e..081a46f7f241 100644
--- a/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1
+++ b/metadata/md5-cache/app-i18n/man-pages-it-2.80-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=A somewhat comprehensive collection of Italian Linux man pages
 EAPI=5
 HOMEPAGE=http://it.tldp.org/man/
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=man-pages GPL-2+ BSD MIT FDL-1.1+ public-domain man-pages-posix
 RDEPEND=virtual/man
 SLOT=0
 SRC_URI=ftp://ftp.pluto.it/pub/pluto/ildp/man/man-pages-it-2.80.tar.gz
-_md5_=48995a762d1adc5b577fc39191635aef
+_md5_=94b916dbb9bfba40ef2c28b9e9d9fa24
diff --git a/metadata/md5-cache/app-misc/gentoo-0.20.1 b/metadata/md5-cache/app-misc/gentoo-0.20.1
index 4370a23eeff3..bc797720a8ac 100644
--- a/metadata/md5-cache/app-misc/gentoo-0.20.1
+++ b/metadata/md5-cache/app-misc/gentoo-0.20.1
@@ -4,10 +4,10 @@ DESCRIPTION=A modern GTK+ based filemanager for any WM
 EAPI=5
 HOMEPAGE=http://www.obsession.se/gentoo/
 IUSE=nls
-KEYWORDS=~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://sourceforge/gentoo/gentoo-0.20.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=41669636d3f886c9fb6720fdde363d84
+_md5_=189c27a62958fb440626962cb768b98b
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
index 761d0a2c5391..40c91411c5e2 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.8 ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) zlib? ( sys-libs/zlib ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 DESCRIPTION=Quick Database Manager
-EAPI=4
+EAPI=5
 HOMEPAGE=http://fallabs.com/qdbm/
 IUSE=cxx debug java perl ruby zlib elibc_FreeBSD java
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
-RDEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.8 ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.1.9-r1 )
+RDEPEND=java? ( >=virtual/jre-1.4 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0
 SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=0c698ac707b1829413ae525813130f2a
+_md5_=745d100c94fc544d35e4bf59df07b906
diff --git a/metadata/md5-cache/dev-libs/glib-2.34.3 b/metadata/md5-cache/dev-libs/glib-2.34.3
deleted file mode 100644
index d0a90c5935f3..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.34.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.3 ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.34.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
-RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.34.3 ) utils? ( =dev-lang/python-2* )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.34/glib-2.34.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c2a988e09fb484f2abf86e2aadb9eade
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.3-r1 b/metadata/md5-cache/dev-libs/glib-2.36.3-r1
deleted file mode 100644
index 0201aaaba59d..000000000000
--- a/metadata/md5-cache/dev-libs/glib-2.36.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-libs/gobject-introspection-1.36 !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=The GLib library of C routines
-EAPI=5
-HOMEPAGE=http://www.gtk.org/
-IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=LGPL-2+
-PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
-RDEPEND=virtual/libiconv virtual/libffi sys-libs/zlib || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] )
-SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.3.tar.xz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=62ee7191fb554f71744ca3756cab7da1
diff --git a/metadata/md5-cache/dev-libs/glib-2.36.3-r2 b/metadata/md5-cache/dev-libs/glib-2.36.4-r1
similarity index 95%
rename from metadata/md5-cache/dev-libs/glib-2.36.3-r2
rename to metadata/md5-cache/dev-libs/glib-2.36.4-r1
index 1dfd7f0ae180..5c394827dd64 100644
--- a/metadata/md5-cache/dev-libs/glib-2.36.3-r2
+++ b/metadata/md5-cache/dev-libs/glib-2.36.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) fam? ( virtual/fam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-libs/gobject-introspection-1.36 !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) fam? ( virtual/fam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-text/docbook-xml-dtd:4.1.2 >=dev-libs/libxslt-1.0 >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=sys-apps/dbus-1.2.14 ) !<dev-libs/gobject-introspection-1.36 !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=The GLib library of C routines
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
@@ -7,8 +7,8 @@ IUSE=debug fam kernel_linux selinux static-libs systemtap test utils xattr pytho
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2+
 PDEPEND=x11-misc/shared-mime-info !<gnome-base/gvfs-1.6.4-r990
-RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) fam? ( virtual/fam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+RDEPEND=virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] virtual/libffi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] || ( >=dev-libs/elfutils-0.142 >=dev-libs/libelf-0.8.12 >=sys-freebsd/freebsd-lib-9.2_rc1 ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) fam? ( virtual/fam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] ) utils? ( python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-util/gdbus-codegen-2.36.4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
-SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
+SRC_URI=mirror://gnome/sources/glib/2.36/glib-2.36.4.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	cccf36bdb93b54baafea3b9d97abb0bf	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multilib-minimal	09c985fcba99d0f16fc7161fffa80730	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pax-utils	2424f959506320f5196de8f79fa05297	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f97313ce67b60ed6236434ea144a2874
+_md5_=f0b3744397cfb344c343194ce4ae19b1
diff --git a/metadata/md5-cache/dev-ml/findlib-1.4 b/metadata/md5-cache/dev-ml/findlib-1.4
index a21bad2427ff..433c61722672 100644
--- a/metadata/md5-cache/dev-ml/findlib-1.4
+++ b/metadata/md5-cache/dev-ml/findlib-1.4
@@ -4,10 +4,10 @@ DESCRIPTION=OCaml tool to find/use non-standard packages.
 EAPI=5
 HOMEPAGE=http://projects.camlcity.org/projects/findlib.html
 IUSE=doc +ocamlopt tk
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/findlib-1.4.tar.gz
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=25706b1a18fcc748e51d512b38d8ed86
+_md5_=636ca6ffc3031090e4cfc226f3f4e45f
diff --git a/metadata/md5-cache/dev-python/beaker-1.6.4-r1 b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
index ce1e4a249e1a..3e33d39955b9 100644
--- a/metadata/md5-cache/dev-python/beaker-1.6.4-r1
+++ b/metadata/md5-cache/dev-python/beaker-1.6.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Session and Caching library with WSGI Middleware
 EAPI=5
 HOMEPAGE=http://beaker.groovie.org/ http://pypi.python.org/pypi/Beaker
 IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=mirror://pypi/B/Beaker/Beaker-1.6.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0df2791db929a9512c22c8ff784629d4
+_md5_=e492753cba2a1586022a304d5a900499
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2 b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
index 343090c182a0..8d4b17bd6dbc 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
@@ -4,11 +4,11 @@ DESCRIPTION=HTML/XML parser for quick-turnaround applications like screen-scrapi
 EAPI=5
 HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup
 IUSE=python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!dev-python/beautifulsoup:0 python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=python-3
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-3.1.0.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=54e3d84e89723b9200454859f562a59c
+_md5_=286bc8fa0be86163048a6da44adb91fe
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1 b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
index 57788bf49d4b..762b5a88d1d2 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HTML/XML parser for quick-turnaround applications like screen-scrapi
 EAPI=5
 HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!dev-python/beautifulsoup:0 python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=python-2
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8aec95b3a014c976291f05343a315589
+_md5_=c1987086c3b5e580dfd805aefbc2d036
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.1 b/metadata/md5-cache/dev-python/bitstring-3.1.1
index 3846a4d6c859..50a7449dcad5 100644
--- a/metadata/md5-cache/dev-python/bitstring-3.1.1
+++ b/metadata/md5-cache/dev-python/bitstring-3.1.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
+DEPEND=app-arch/unzip test? ( virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 DESCRIPTION=A pure Python module for creation and analysis of binary data
 EAPI=5
 HOMEPAGE=http://python-bitstring.googlecode.com/
-IUSE=python_targets_python2_6 python_targets_python2_7 python_targets_python3_2
+IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://python-bitstring.googlecode.com/files/bitstring-3.1.1.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1db46a8103492f1ee5f6379694026843
+_md5_=d172a31e737b773fdcfc1f345dc9ae0b
diff --git a/metadata/md5-cache/dev-python/bottle-0.11.6-r1 b/metadata/md5-cache/dev-python/bottle-0.11.6-r1
index dea60e7491e1..64e70e830215 100644
--- a/metadata/md5-cache/dev-python/bottle-0.11.6-r1
+++ b/metadata/md5-cache/dev-python/bottle-0.11.6-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/bottle/bottle-0.11.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df20191450ba35ba4e3ba757a9f20925
+_md5_=250b0ce774e4c9b0b82d81764ebc1d5d
diff --git a/metadata/md5-cache/dev-python/cement-2.0.2 b/metadata/md5-cache/dev-python/cement-2.0.2
index 4af3434a5280..5b4f309e14ad 100644
--- a/metadata/md5-cache/dev-python/cement-2.0.2
+++ b/metadata/md5-cache/dev-python/cement-2.0.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 DESCRIPTION=CLI Application Framework for Python
 EAPI=5
 HOMEPAGE=http://builtoncement.com/
-IUSE=test doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
+IUSE=test doc python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] ) virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
+RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/coverage[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) virtual/python-argparse[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://builtoncement.com/cement/2.0/source/cement-2.0.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f4152df769c42df916f57028c976ae6f
+_md5_=4ec628d14d26699908d2af3534d39207
diff --git a/metadata/md5-cache/dev-python/cssselect-0.7.1-r1 b/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
index 22b05f5dfa09..e440f41b831a 100644
--- a/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
+++ b/metadata/md5-cache/dev-python/cssselect-0.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=parses CSS3 Selectors and translates them to XPath 1.0
 EAPI=5
 HOMEPAGE=http://packages.python.org/cssselect/ http://pypi.python.org/pypi/cssselect
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/c/cssselect/cssselect-0.7.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=98d9812da73dbef7f3781781755caa21
+_md5_=bbe240d8b1d68911b02750de5ea0e4f5
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.11 b/metadata/md5-cache/dev-python/d2to1-0.2.11
new file mode 100644
index 000000000000..4a01c1d60201
--- /dev/null
+++ b/metadata/md5-cache/dev-python/d2to1-0.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Allows using distutils2-like setup.cfg files for a package metadata
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/d2to1
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.11.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=cda1f2cbc8ff2e1d670a47f9ccef3d6b
diff --git a/metadata/md5-cache/dev-python/d2to1-0.2.9 b/metadata/md5-cache/dev-python/d2to1-0.2.9
deleted file mode 100644
index a13614274c04..000000000000
--- a/metadata/md5-cache/dev-python/d2to1-0.2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/setuptools dev-lang/python
-DESCRIPTION=Allows using distutils2-like setup.cfg files for a package metadata
-EAPI=4
-HOMEPAGE=http://pypi.python.org/pypi/d2to1
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/setuptools dev-lang/python
-SLOT=0
-SRC_URI=mirror://pypi/d/d2to1/d2to1-0.2.9.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=699cd498f71a58270ab7b103df6e9873
diff --git a/metadata/md5-cache/dev-python/deform-0.9.2 b/metadata/md5-cache/dev-python/deform-0.9.2
deleted file mode 100644
index 2b761c2ece9e..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/translationstring >=dev-python/colander-0.8 >=dev-python/peppercorn-0.3 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Another form generation library
-EAPI=3
-HOMEPAGE=http://pylonsproject.org/ http://pypi.python.org/pypi/deform
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-python/translationstring >=dev-python/colander-0.8 >=dev-python/peppercorn-0.3 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.2.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=7f5ff6750f15d90d9e7add82a13763d6
diff --git a/metadata/md5-cache/dev-python/deform-0.9.3 b/metadata/md5-cache/dev-python/deform-0.9.3
deleted file mode 100644
index 0f8410407aea..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/translationstring >=dev-python/colander-0.8 >=dev-python/peppercorn-0.3 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Another form generation library
-EAPI=3
-HOMEPAGE=http://pylonsproject.org/ http://pypi.python.org/pypi/deform
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=dev-python/translationstring >=dev-python/colander-0.8 >=dev-python/peppercorn-0.3 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.3.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=c17e0ce0c8f7e4b0eff90957bd89dfcd
diff --git a/metadata/md5-cache/dev-python/deform-0.9.4 b/metadata/md5-cache/dev-python/deform-0.9.4
deleted file mode 100644
index 87ba33e1e4e0..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-0.9.6 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Another form generation library
-EAPI=3
-HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-0.9.6 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.4.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=a9475926e9d5819ebd2edd216307d52d
diff --git a/metadata/md5-cache/dev-python/deform-0.9.5 b/metadata/md5-cache/dev-python/deform-0.9.5
deleted file mode 100644
index aef5ae7d6682..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-0.9.6 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup:4 ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Another form generation library
-EAPI=3
-HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-0.9.6 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.5.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=104e55efec38d099e3fae8d4a8384dee
diff --git a/metadata/md5-cache/dev-python/deform-0.9.6 b/metadata/md5-cache/dev-python/deform-0.9.6
deleted file mode 100644
index d1db5a10ae43..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup:4 ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Another form generation library
-EAPI=3
-HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.6.tar.gz
-_eclasses_=distutils	34e0f373c466bb0e97ba194735f1acf2	multilib	892e597faee02a5b94eb02ab512e7622	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=8f694e2abb8566be9cbabf11b8fdcd74
diff --git a/metadata/md5-cache/dev-python/deform-0.9.6-r1 b/metadata/md5-cache/dev-python/deform-0.9.6-r1
deleted file mode 100644
index c15f7159bf47..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.6-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup:4 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
-DESCRIPTION=Another form generation library
-EAPI=5
-HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.6.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e5acd8c319567a65c6e291c80d4a4e03
diff --git a/metadata/md5-cache/dev-python/deform-0.9.7 b/metadata/md5-cache/dev-python/deform-0.9.7
deleted file mode 100644
index 00f12d3a59e1..000000000000
--- a/metadata/md5-cache/dev-python/deform-0.9.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup:4 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
-DESCRIPTION=Another form generation library
-EAPI=5
-HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~x86
-LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/d/deform/deform-0.9.7.tar.gz
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8d0e4ae18467a6620cbfaf27436ae3e6
diff --git a/metadata/md5-cache/dev-python/deform-0.9.8 b/metadata/md5-cache/dev-python/deform-0.9.8
index f09b14b5c548..2cf1d4420781 100644
--- a/metadata/md5-cache/dev-python/deform-0.9.8
+++ b/metadata/md5-cache/dev-python/deform-0.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 test? ( dev-python/beautifulsoup:4 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DEPEND=>=dev-python/translationstring-1.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/colander-1.0_alpha1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/peppercorn-0.4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/chameleon-1.2.3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] test? ( dev-python/beautifulsoup:4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Another form generation library
 EAPI=5
 HOMEPAGE=http://docs.pylonsproject.org/projects/deform/en/latest/ http://pypi.python.org/pypi/deform https://github.com/Pylons/deform
-IUSE=test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+IUSE=test python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~amd64 ~x86
 LICENSE=repoze
-RDEPEND=>=dev-python/translationstring-1.1 >=dev-python/colander-1.0_alpha1 >=dev-python/peppercorn-0.4 >=dev-python/chameleon-1.2.3 python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0 )
+RDEPEND=>=dev-python/translationstring-1.1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/colander-1.0_alpha1[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/peppercorn-0.4[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] >=dev-python/chameleon-1.2.3[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/d/deform/deform-0.9.8.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bb4fb7fe31f1d465d5a9c9bc8f48895e
+_md5_=d42afd6066158b6ab0324acf4fe27568
diff --git a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6 b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
index 3c2d8273377b..d8c8a9a8b7a9 100644
--- a/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
+++ b/metadata/md5-cache/dev-python/egenix-mx-base-3.2.6
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe
 SLOT=0
 SRC_URI=http://downloads.egenix.com/python/egenix-mx-base-3.2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=63351fd3066ec01e928134d3587d0733
+_md5_=4ec9183b6ccc23318c67bd65ba1355c3
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r1 b/metadata/md5-cache/dev-python/jinja-2.6-r1
index a38a6e734073..c95ac1fa060b 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6-r1
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but fast and easy to use stand-alone template engine written
 EAPI=5
 HOMEPAGE=http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
 IUSE=doc examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e4f8876920eb2417020b707f230c419
+_md5_=da52cc1f1e4c36ed9473ac90d1b5e0e8
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r100 b/metadata/md5-cache/dev-python/jinja-2.6-r100
index 6ce2989c492d..f42570b1f4de 100644
--- a/metadata/md5-cache/dev-python/jinja-2.6-r100
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r100
@@ -4,11 +4,11 @@ DESCRIPTION=A small but fast and easy to use stand-alone template engine written
 EAPI=5
 HOMEPAGE=http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
 IUSE=doc examples python_targets_python2_5 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] !<dev-python/jinja-2.7:0 python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python3_1 python_targets_python3_2 )
 SLOT=compat
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.6.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e1e6c609ba6a400cf2efd85406e9e111
+_md5_=c0bbfc43a8639b82332ed87a64cbcbfb
diff --git a/metadata/md5-cache/dev-python/jinja-2.7 b/metadata/md5-cache/dev-python/jinja-2.7
index a5eb50cae2bd..a7c19abfa576 100644
--- a/metadata/md5-cache/dev-python/jinja-2.7
+++ b/metadata/md5-cache/dev-python/jinja-2.7
@@ -4,11 +4,11 @@ DESCRIPTION=A small but fast and easy to use stand-alone template engine written
 EAPI=5
 HOMEPAGE=http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
 IUSE=doc examples python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=dev-python/markupsafe[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/J/Jinja2/Jinja2-2.7.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0dd3a0597bf3d7dfa2a33316f396e9b4
+_md5_=a601674f6569a9854a465019094d7200
diff --git a/metadata/md5-cache/dev-python/logilab-common-0.60.0 b/metadata/md5-cache/dev-python/logilab-common-0.60.0
index 5683035ef56a..308db73ad868 100644
--- a/metadata/md5-cache/dev-python/logilab-common-0.60.0
+++ b/metadata/md5-cache/dev-python/logilab-common-0.60.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( dev-python/egenix-mx-base[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !dev-python/psycopg[-mxdatetime] ) doc? ( dev-python/epydoc ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] virtual/python-unittest2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( python_targets_python2_6? ( dev-python/egenix-mx-base[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/egenix-mx-base[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !dev-python/psycopg[-mxdatetime] ) doc? ( dev-python/epydoc ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Useful miscellaneous modules used by Logilab projects
 EAPI=5
 HOMEPAGE=http://www.logilab.org/project/logilab-common http://pypi.python.org/pypi/logilab-common
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=0
 SRC_URI=ftp://ftp.logilab.org/pub/common/logilab-common-0.60.0.tar.gz mirror://pypi/l/logilab-common/logilab-common-0.60.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=518a7d8ba917020dfff8bf913db026d5
+_md5_=de53578a15ed909cd5337c205c889756
diff --git a/metadata/md5-cache/dev-python/lxml-3.2.1 b/metadata/md5-cache/dev-python/lxml-3.2.1
index 9fa3f1ec0942..15d79cce23f2 100644
--- a/metadata/md5-cache/dev-python/lxml-3.2.1
+++ b/metadata/md5-cache/dev-python/lxml-3.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
 IUSE=beautifulsoup3 doc examples +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
 RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.2.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=389fd042dc27b677c32d8392abd1a8a4
+_md5_=ecc719948ce670b67ed4efe965abfe92
diff --git a/metadata/md5-cache/dev-python/mako-0.7.3-r1 b/metadata/md5-cache/dev-python/mako-0.7.3-r1
index d2b25033b439..b52bf82c6cfc 100644
--- a/metadata/md5-cache/dev-python/mako-0.7.3-r1
+++ b/metadata/md5-cache/dev-python/mako-0.7.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A Python templating language
 EAPI=5
 HOMEPAGE=http://www.makotemplates.org/ http://pypi.python.org/pypi/Mako
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/beaker-1.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] >=dev-python/markupsafe-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 )
 SLOT=0
 SRC_URI=http://www.makotemplates.org/downloads/Mako-0.7.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6edfffca144a1a5a22e782fdfeee8c00
+_md5_=0c72e6f4b9dc3feaba0f951bd27ca6dc
diff --git a/metadata/md5-cache/dev-python/markupsafe-0.15-r1 b/metadata/md5-cache/dev-python/markupsafe-0.15-r1
index da7da31060d8..3c6123343c80 100644
--- a/metadata/md5-cache/dev-python/markupsafe-0.15-r1
+++ b/metadata/md5-cache/dev-python/markupsafe-0.15-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Implements a XML/HTML/XHTML Markup safe string for Python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/MarkupSafe
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/M/MarkupSafe/MarkupSafe-0.15.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e91d9359284f35b29eee23aa8e80e7e2
+_md5_=98748f0d34a8e4032e13dace62c0c0b3
diff --git a/metadata/md5-cache/dev-python/ordereddict-1.1 b/metadata/md5-cache/dev-python/ordereddict-1.1
new file mode 100644
index 000000000000..fe9b0209177e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ordereddict-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) dev-python/python-exec[python_targets_python2_6(-)?,-python_single_target_python2_6(-)]
+DESCRIPTION=A drop-in substitute for Py2.7's new collections.OrderedDict
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/ordereddict
+IUSE=python_targets_python2_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) dev-python/python-exec[python_targets_python2_6(-)?,-python_single_target_python2_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 )
+SLOT=0
+SRC_URI=mirror://pypi/o/ordereddict/ordereddict-1.1.tar.gz
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b6bbf376c6428ce214c44eff3ab1bfac
diff --git a/metadata/md5-cache/dev-python/pycurl-7.19.0-r3 b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
index 8a6221945fc0..81b5e6334ad2 100644
--- a/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
+++ b/metadata/md5-cache/dev-python/pycurl-7.19.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=python binding for curl/libcurl
 EAPI=5
 HOMEPAGE=http://pycurl.sourceforge.net/ http://pypi.python.org/pypi/pycurl
 IUSE=curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl examples ssl python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=net-misc/curl-7.25.0-r1[ssl=] ssl? ( net-misc/curl[curl_ssl_gnutls=,curl_ssl_nss=,curl_ssl_openssl=,-curl_ssl_axtls,-curl_ssl_cyassl,-curl_ssl_polarssl] curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0 ) ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://pycurl.sourceforge.net/download/pycurl-7.19.0.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=834500588ff84a50ab27b6a791955bfe
+_md5_=b957e5706700eb4ff9da705748813e82
diff --git a/metadata/md5-cache/dev-python/pyquery-1.2.4 b/metadata/md5-cache/dev-python/pyquery-1.2.4
index 2c0dff421a7b..8ed66df1f417 100644
--- a/metadata/md5-cache/dev-python/pyquery-1.2.4
+++ b/metadata/md5-cache/dev-python/pyquery-1.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=A jQuery-like library for python
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pyquery
 IUSE=beautifulsoup3 test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=BSD
 RDEPEND=>=dev-python/lxml-2.1[beautifulsoup3?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/cssselect[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/webob-1.2_rc1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=test? ( beautifulsoup3 ) || ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyquery/pyquery-1.2.4.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ab306f9542aa666177c69cc2920473fe
+_md5_=097b0a9ba5f3226c2c31cbbed43db9bc
diff --git a/metadata/md5-cache/dev-python/python-slip-0.2.21 b/metadata/md5-cache/dev-python/python-slip-0.2.21
deleted file mode 100644
index ca55928b984b..000000000000
--- a/metadata/md5-cache/dev-python/python-slip-0.2.21
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<sys-apps/portage-2.1.10.58 python_targets_python2_7? ( dev-lang/python:2.7 )
-DESCRIPTION=Miscellaneous convenience, extension and workaround code for Python
-EAPI=4
-HOMEPAGE=https://fedorahosted.org/python-slip/
-IUSE=dbus gtk selinux python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dbus? ( dev-python/dbus-python dev-python/pygobject:2 sys-auth/polkit ) gtk? ( dev-python/pygtk:2 ) python_targets_python2_7? ( dev-lang/python:2.7 )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/python-slip/python-slip-0.2.21.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	python-distutils-ng	a5be27b6f8e71ff6b1e5ed69ef2f8f1c	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e7bf4870e9f2968779bd4c12703d7326
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r6 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
index 484f759fbb06..f7cd4c5919a7 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Python documentation generator
 EAPI=5
 HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 IUSE=doc latex test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/docutils-0.7[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.3[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/pygments-1.2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=46450247994c5340ae603bdcc031eca6
+_md5_=52e17e8e6d4f9c5bcce3264870cfbdf8
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r7 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
index b343e1fcb059..7e3f207512e4 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
@@ -4,11 +4,11 @@ DESCRIPTION=Python documentation generator
 EAPI=5
 HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
 IUSE=doc latex test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-python/docutils-0.7[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.3[python_targets_python2_5(-)?,-python_single_target_python2_5(-),python_targets_python3_1(-)?,-python_single_target_python3_1(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-)] >=dev-python/jinja-2.3[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] >=dev-python/pygments-1.2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=613f6c984557386912b9577da2416558
+_md5_=249f37471c1c8eacbbc0c5651cbd3294
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-0.8.2 b/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
index 8d74e52328e1..1c3538adfbb0 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
+++ b/metadata/md5-cache/dev-python/sqlalchemy-0.8.2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-0.8.2.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3ba42aa86bebca59f110ade13a276c8b
+_md5_=330edae81cd0626194c9792bca479491
diff --git a/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1 b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
index 4f793a0f8279..507249e24304 100644
--- a/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
+++ b/metadata/md5-cache/dev-python/virtualenv-1.9.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Virtual Python Environment builder
 EAPI=5
 HOMEPAGE=http://www.virtualenv.org/ http://pypi.python.org/pypi/virtualenv
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( virtual/pypy:1.9 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=https://github.com/pypa/virtualenv/tarball/1.9.1 -> virtualenv-1.9.1.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=8d3875495430d0f91a6c904dbf05b189
+_md5_=0a577b72102deed51f5ba3ad8b3faa8a
diff --git a/metadata/md5-cache/dev-python/webob-1.2.3-r1 b/metadata/md5-cache/dev-python/webob-1.2.3-r1
index 4778da879c8f..47fe1e396d67 100644
--- a/metadata/md5-cache/dev-python/webob-1.2.3-r1
+++ b/metadata/md5-cache/dev-python/webob-1.2.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=WSGI request and response object
 EAPI=5
 HOMEPAGE=http://webob.org/ http://pypi.python.org/pypi/WebOb
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( virtual/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.2.3.tar.gz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=f11347908ac779736f6cf254247b7221
+_md5_=968f80f687dc3832f45e820b5ef97cfa
diff --git a/metadata/md5-cache/dev-python/webtest-1.4.3-r1 b/metadata/md5-cache/dev-python/webtest-1.4.3-r1
index 4295f4c0df3a..7aaba0dc1fbe 100644
--- a/metadata/md5-cache/dev-python/webtest-1.4.3-r1
+++ b/metadata/md5-cache/dev-python/webtest-1.4.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Helper to test WSGI applications
 EAPI=5
 HOMEPAGE=http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebTest/WebTest-1.4.3.zip
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=adc09fe0fdf1d61324524f15f2056434
+_md5_=3f9337cc8f32862f500a94e4aca7bbd5
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.7 b/metadata/md5-cache/dev-python/webtest-2.0.7
deleted file mode 100644
index dd226ab0dece..000000000000
--- a/metadata/md5-cache/dev-python/webtest-2.0.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] app-arch/unzip dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pyquery[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/waitress[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/wsgiproxy2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/paste dev-python/pastedeploy ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Helper to test WSGI applications
-EAPI=5
-HOMEPAGE=http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest
-IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.7.zip
-_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=78acb42f5526b6f24af48431f6c6e90d
diff --git a/metadata/md5-cache/dev-python/webtest-2.0.7-r1 b/metadata/md5-cache/dev-python/webtest-2.0.7-r1
new file mode 100644
index 000000000000..1a6d2d6d5af5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/webtest-2.0.7-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/waitress-0.8.5[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-python/ordereddict[python_targets_python2_6] ) app-arch/unzip dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/pyquery[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/wsgiproxy2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/paste dev-python/pastedeploy ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=Helper to test WSGI applications
+EAPI=5
+HOMEPAGE=http://pythonpaste.org/webtest/ http://pypi.python.org/pypi/WebTest
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/six[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/waitress-0.8.5[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] >=dev-python/webob-0.9.2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/beautifulsoup:4[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-python/ordereddict[python_targets_python2_6] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/W/WebTest/WebTest-2.0.7.zip
+_eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b5f70805ee80939b1154fd48c0dfac34
diff --git a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2 b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
index 757bc82504f2..48e60992ef8d 100644
--- a/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
+++ b/metadata/md5-cache/dev-ruby/RubyInline-3.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Allows to embed C/C++ in Ruby code
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/RubyInline/
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/zentest[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/zentest[ruby_targets_ruby19] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/RubyInline-3.12.2.gem
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f05fa7d9fb58aa6364f27118a5bec1bf
+_md5_=bffe317c96df3e7b2a9d8abc2b0e9399
diff --git a/metadata/md5-cache/dev-ruby/json-1.8.0-r1 b/metadata/md5-cache/dev-ruby/json-1.8.0-r1
new file mode 100644
index 000000000000..cb9166669e46
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/json-1.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-util/ragel ruby_targets_ruby18? ( dev-ruby/rake[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/rake[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rake[ruby_targets_ruby20] ) ruby_targets_jruby? ( dev-ruby/rake[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=A JSON implementation as a Ruby extension.
+EAPI=5
+HOMEPAGE=http://json.rubyforge.org/
+IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Ruby GPL-2 )
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/json-1.8.0.gem
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	6e366daedf25d7020291916549562bbf	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=ea13e08d6d5a5bcd1b540356f4837daa
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
index 77b46ced37ba..2828be7623f6 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.32.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=http://www.gtk.org/
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.32.4:2
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] python_targets_python2_5? ( dev-lang/python:2.5[xml] ) python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) python_targets_python3_1? ( dev-lang/python:3.1[xml] ) python_targets_python3_2? ( dev-lang/python:3.2[xml] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.32/glib-2.32.4.tar.xz
 _eclasses_=distutils-r1	d260e4e05b2ca2981f6b6ab937e7ab9d	eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d03cea3b94e4679f4c6c15a0084a2c04
+_md5_=c5ee8fa53d74beb11bd95c3af4f36817
diff --git a/metadata/md5-cache/gnome-base/gdm-3.6.2-r1 b/metadata/md5-cache/gnome-base/gdm-3.6.2-r1
index e41e7931f53e..89fcbb2198aa 100644
--- a/metadata/md5-cache/gnome-base/gdm-3.6.2-r1
+++ b/metadata/md5-cache/gnome-base/gdm-3.6.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 virtual/pkgconfig x11-proto/inputproto x11-proto/randrproto test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
 DESCRIPTION=GNOME Display Manager
 EAPI=5
 HOMEPAGE=https://live.gnome.org/GDM
 IUSE=accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama debug
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2+
-RDEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.33.2:2 >=x11-libs/gtk+-2.91.1:3 dev-libs/libdaemon >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=gnome-base/dconf-0.11.6 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.12 >=sys-power/upower-0.9 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam sys-auth/pambase[systemd?] accessibility? ( x11-libs/libXevie ) audit? ( sys-process/audit ) consolekit? ( >=sys-auth/consolekit-0.4.5_p20120320-r2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-186[pam] ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/3.6/gdm-3.6.2.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-gentoo-2012.09.25.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	7976d3f4d0c0816c67033d3dcd4d9472	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b1a35077d1f439d4aa601b8cbb7dc876
+_md5_=f799efa6ed9c135c55f0e6cec43f1b0d
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8 b/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
index af71b860946a..f0f89d2f96c2 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.6.8
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
 EAPI=5
 HOMEPAGE=http://www.imagemagick.org/
 IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=imagemagick
 RDEPEND=>=sys-devel/libtool-2.2.6b autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8 ) png? ( media-libs/libpng:0 ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0 ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2 ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.6.8
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.6-8.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=44a1ed19d834b2802723f77e9d20efd8
+_md5_=69757f19d655f61e8107678ebfef706b
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.16 b/metadata/md5-cache/media-gfx/llgal-0.13.16
deleted file mode 100644
index ceaa9e353952..000000000000
--- a/metadata/md5-cache/media-gfx/llgal-0.13.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DESCRIPTION=Command-line static web gallery generator
-HOMEPAGE=http://home.gna.org/llgal
-IUSE=exif linguas_de linguas_en linguas_it linguas_fr
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick dev-lang/perl dev-perl/ImageSize dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool )
-SLOT=0
-SRC_URI=http://download.gna.org/llgal/llgal-0.13.16.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=368cea7d392572c9a535df5570df2df9
diff --git a/metadata/md5-cache/media-gfx/llgal-0.13.17 b/metadata/md5-cache/media-gfx/llgal-0.13.17-r1
similarity index 62%
rename from metadata/md5-cache/media-gfx/llgal-0.13.17
rename to metadata/md5-cache/media-gfx/llgal-0.13.17-r1
index 63c2d6871887..f662e28ff755 100644
--- a/metadata/md5-cache/media-gfx/llgal-0.13.17
+++ b/metadata/md5-cache/media-gfx/llgal-0.13.17-r1
@@ -1,11 +1,13 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Command-line static web gallery generator
+EAPI=5
 HOMEPAGE=http://home.gna.org/llgal
 IUSE=exif linguas_de linguas_en linguas_it linguas_fr
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=media-gfx/imagemagick dev-lang/perl dev-perl/ImageSize dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool )
+RDEPEND=media-gfx/imagemagick dev-perl/ImageSize dev-perl/URI dev-perl/Locale-gettext exif? ( media-libs/exiftool ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=http://download.gna.org/llgal/llgal-0.13.17.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=5e906a503ff1ca167fcabeacb946caaa
+_md5_=1e26db12b92cde4fe361459431eeb0d0
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.10.92 b/metadata/md5-cache/media-libs/fontconfig-2.10.92
index cacfda8f8e95..531bac803d97 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.10.92
+++ b/metadata/md5-cache/media-libs/fontconfig-2.10.92
@@ -4,11 +4,11 @@ DESCRIPTION=A library for configuring and customizing font access
 EAPI=5
 HOMEPAGE=http://fontconfig.org/
 IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_x86_32 abi_x86_64 abi_mips_n32 abi_mips_n64 abi_mips_o32
-KEYWORDS=~alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=app-admin/eselect-fontconfig virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-1.95.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] >=media-libs/freetype-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.10.92.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-multilib	c576ed7a3d3613a39130380c3d008357	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multilib-build	812deed50460b095dc41672b2da354eb	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	readme.gentoo	2466b2f6a77a9600954c6b99ebca6e02	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9c97f0ae766c8f163861448f89c8c247
+_md5_=2b96410093f82373c010af899ce1a93f
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.17 b/metadata/md5-cache/media-libs/harfbuzz-0.9.17
deleted file mode 100644
index 6e6c94960dfc..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.17
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=An OpenType text shaping engine
-EAPI=5
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=dev-libs/glib:2 dev-libs/icu:= media-gfx/graphite2:= media-libs/freetype:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.17.tar.bz2
-_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=becede5eef735994dc2d2ef3fee61a72
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.20 b/metadata/md5-cache/media-libs/harfbuzz-0.9.20
new file mode 100644
index 000000000000..2bffb8e266e5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) truetype? ( media-libs/freetype:2= ) >=dev-libs/gobject-introspection-common-1.32 dev-util/gtk-doc-am dev-util/ragel virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=An OpenType text shaping engine
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
+IUSE=+cairo +glib +graphite icu introspection static-libs +truetype
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-macos ~x64-macos ~x64-solaris
+LICENSE=Old-MIT ISC icu
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=introspection? ( glib )
+SLOT=0/0.9.18
+SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.20.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e1e6fb78a7e040d443f36cb48697e35b
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index b91198be57ba..f111bd98e44c 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -1,11 +1,12 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) truetype? ( media-libs/freetype:2= ) dev-util/ragel virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) truetype? ( media-libs/freetype:2= ) >=dev-libs/gobject-introspection-common-1.32 dev-util/gtk-doc-am dev-util/ragel virtual/pkgconfig dev-vcs/git || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=An OpenType text shaping engine
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo +glib +graphite icu static-libs +truetype
+IUSE=+cairo +glib +graphite icu introspection static-libs +truetype
 LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) truetype? ( media-libs/freetype:2= )
+RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2:= ) icu? ( dev-libs/icu:= ) introspection? ( >=dev-libs/gobject-introspection-1.32 ) truetype? ( media-libs/freetype:2= )
+REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9b9a2373649f3dd6afda560c528ac5fe
+_md5_=f6e7ade49daa1d6939fa1a8ced7e83d4
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.3 b/metadata/md5-cache/media-sound/lltag-0.14.3
deleted file mode 100644
index b2f02ae0ac69..000000000000
--- a/metadata/md5-cache/media-sound/lltag-0.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl dev-perl/libwww-perl mp3? ( || ( media-sound/mp3info dev-perl/MP3-Tag ) ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-DESCRIPTION=Automatic command-line mp3/ogg/flac file tagger and renamer
-EAPI=2
-HOMEPAGE=http://home.gna.org/lltag
-IUSE=flac mp3 ogg readline
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl mp3? ( || ( media-sound/mp3info dev-perl/MP3-Tag ) ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
-SLOT=0
-SRC_URI=http://download.gna.org/lltag/lltag-0.14.3.tar.bz2
-_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=cb591b948f8222d912a895945a1afe26
diff --git a/metadata/md5-cache/media-sound/lltag-0.14.4 b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
similarity index 53%
rename from metadata/md5-cache/media-sound/lltag-0.14.4
rename to metadata/md5-cache/media-sound/lltag-0.14.4-r1
index c089de83a3e0..453ef51afa81 100644
--- a/metadata/md5-cache/media-sound/lltag-0.14.4
+++ b/metadata/md5-cache/media-sound/lltag-0.14.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+DEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Automatic command-line mp3/ogg/flac file tagger and renamer
-EAPI=2
+EAPI=5
 HOMEPAGE=http://home.gna.org/lltag
 IUSE=flac mp3 ogg readline
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
+RDEPEND=dev-perl/libwww-perl mp3? ( media-sound/mp3info dev-perl/MP3-Tag ) ogg? ( media-sound/vorbis-tools ) flac? ( media-libs/flac ) readline? ( dev-perl/Term-ReadLine-Perl ) || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=http://download.gna.org/lltag/lltag-0.14.4.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=be70786afe7ab93cd238c05176bb05f8
+_md5_=656ba87fe19e5298305f1a4b33203364
diff --git a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r1 b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r2
similarity index 68%
rename from metadata/md5-cache/net-dialup/sendpage-1.1.0-r1
rename to metadata/md5-cache/net-dialup/sendpage-1.1.0-r2
index fa37a9aeb614..8f67a729e201 100644
--- a/metadata/md5-cache/net-dialup/sendpage-1.1.0-r1
+++ b/metadata/md5-cache/net-dialup/sendpage-1.1.0-r2
@@ -1,11 +1,12 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm setup test unpack
-DEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI || ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 DESCRIPTION=Dialup alphapaging software.
+EAPI=5
 HOMEPAGE=http://www.sendpage.org/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
-RDEPEND=!net-misc/hylafax >=dev-perl/Device-SerialPort-0.13 >=dev-perl/MailTools-1.44 >=virtual/perl-libnet-1.11 >=dev-perl/Net-SNPP-1.13 dev-perl/DBI
+RDEPEND=|| ( >=dev-lang/perl-5.16 <dev-lang/perl-5.16[-build] )
 SLOT=0
 SRC_URI=http://www.sendpage.org/download/sendpage-1.001.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	perl-module	d93571ca1c77e98760e5aa406388b02d	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f44d30e1fefdb62996446c000aba83a
+_md5_=a2a5ad6aee5f673ccbf722ce5915b5dd
diff --git a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2 b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
index 5ac66b1aa378..9a3e7455a1de 100644
--- a/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
+++ b/metadata/md5-cache/net-libs/gtk-vnc-0.5.2
@@ -4,11 +4,11 @@ DESCRIPTION=VNC viewer widget for GTK
 EAPI=5
 HOMEPAGE=https://live.gnome.org/gtk-vnc
 IUSE=examples +gtk3 +introspection pulseaudio python sasl vala python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.30.1:2 >=dev-libs/libgcrypt-1.4.2 dev-libs/libgpg-error >=net-libs/gnutls-1.4 >=x11-libs/cairo-1.2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 gtk3? ( >=x11-libs/gtk+-2.91.3:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9.4 ) pulseaudio? ( media-sound/pulseaudio ) python? ( python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] >=dev-python/pygtk-2:2[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] ) sasl? ( dev-libs/cyrus-sasl )
 REQUIRED_USE=python? ( || ( python_targets_python2_6 python_targets_python2_7 ) ) vala? ( gtk3 introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gtk-vnc/0.5/gtk-vnc-0.5.2.tar.xz
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	c6b8362c67424d5095da2c9634cd25c9	python-utils-r1	3668f5e62c6e2526acef650e8e1e8fc4	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	vala	aa890daf29e67d32e9bff8e12ef653ca	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=418f560d0651786708b7f8471d867fc1
+_md5_=396ba9774379da26cacfcea550c76040
diff --git a/metadata/md5-cache/net-libs/liboauth-1.0.1 b/metadata/md5-cache/net-libs/liboauth-1.0.1
index f29a0689cade..7f470940ef4e 100644
--- a/metadata/md5-cache/net-libs/liboauth-1.0.1
+++ b/metadata/md5-cache/net-libs/liboauth-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=C library implementing the OAuth secure authentication protocol
 EAPI=5
 HOMEPAGE=http://liboauth.sourceforge.net/
 IUSE=curl doc bindist +nss
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos
 LICENSE=|| ( GPL-2 MIT )
 RDEPEND=nss? ( dev-libs/nss curl? ( || ( net-misc/curl[ssl,curl_ssl_nss] net-misc/curl[-ssl] ) ) ) !nss? ( dev-libs/openssl curl? ( || ( net-misc/curl[ssl,curl_ssl_openssl] net-misc/curl[-ssl] ) ) ) net-misc/curl
 REQUIRED_USE=bindist? ( nss )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/liboauth/liboauth-1.0.1.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fbaeb03640ba8724b127c87b3936e66f
+_md5_=856dde8e578786ea2e0be6d5eb2a3d87
diff --git a/metadata/md5-cache/net-mail/dbmail-3.1.4 b/metadata/md5-cache/net-mail/dbmail-3.1.4
new file mode 100644
index 000000000000..ca328e20ef4a
--- /dev/null
+++ b/metadata/md5-cache/net-mail/dbmail-3.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib >=dev-libs/gmime-2.4.6:2.4 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( dev-libs/openssl )
+DESCRIPTION=DBMail is an open-source project that enables storage of mail messages in a relational database.
+EAPI=4
+HOMEPAGE=http://www.dbmail.org/
+IUSE=ldap sieve +sqlite ssl static
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/libzdb sieve? ( >=mail-filter/libsieve-2.2.1 ) ldap? ( >=net-nds/openldap-2.3.33 ) app-text/asciidoc app-text/xmlto app-crypt/mhash sys-libs/zlib >=dev-libs/gmime-2.4.6:2.4 >=dev-libs/glib-2.16 dev-libs/libevent ssl? ( dev-libs/openssl )
+SLOT=0
+SRC_URI=http://www.dbmail.org/download/3.1/dbmail-3.1.4.tar.gz
+_eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2a5331241efb4b9c65989b1d2cfc1de3
diff --git a/metadata/md5-cache/net-mail/dovecot-2.2.5 b/metadata/md5-cache/net-mail/dovecot-2.2.5
index 9dc76db17a5a..1f465025c115 100644
--- a/metadata/md5-cache/net-mail/dovecot-2.2.5
+++ b/metadata/md5-cache/net-mail/dovecot-2.2.5
@@ -4,10 +4,10 @@ DESCRIPTION=An IMAP and POP3 server written with security primarily in mind
 EAPI=5
 HOMEPAGE=http://www.dovecot.org/
 IUSE=kerberos ldap mysql pam postgres sqlite vpopmail cydir imapc +maildir mbox mdbox pop3c sdbox bzip2 caps doc ipv6 lucene managesieve selinux sieve solr +ssl static-libs suid tcpd zlib ssl
-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=LGPL-2.1 MIT
 RDEPEND=caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) lucene? ( >=dev-cpp/clucene-2.3 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base !dev-db/postgresql-base[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) sqlite? ( dev-db/sqlite ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) vpopmail? ( net-mail/vpopmail ) virtual/libiconv net-mail/mailbase
 SLOT=0
 SRC_URI=http://dovecot.org/releases/2.2/dovecot-2.2.5.tar.gz sieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.1.tar.gz ) managesieve? ( http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.1.tar.gz )
 _eclasses_=eutils	63afaaed8aa819fdcb814c7cd39495a2	multilib	892e597faee02a5b94eb02ab512e7622	ssl-cert	0b45da48a22fda62c57c1809b8b55315	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9f605dbc03db66bfa6ae20d9f47fb102
+_md5_=ffd10d673f6568d4b81c53a34ddcded5
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.35 b/metadata/md5-cache/net-nds/openldap-2.4.35
index 7f022d441948..bd0e343bc820 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.35
+++ b/metadata/md5-cache/net-nds/openldap-2.4.35
@@ -4,11 +4,11 @@ DESCRIPTION=LDAP suite of application and development tools
 EAPI=4
 HOMEPAGE=http://www.OpenLDAP.org/
 IUSE=crypt icu samba slp tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux smbkrb5passwd kerberos -cxx ssl
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=OPENLDAP
 RDEPEND=icu? ( dev-libs/icu ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( sys-devel/libtool tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-ldap )
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=mirror://openldap/openldap-release/openldap-2.4.35.tgz mirror://gentoo/rfc2307bis.schema-20120525
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	db-use	1c719875d6599536f956fafea9e1f404	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	ssl-cert	0b45da48a22fda62c57c1809b8b55315	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=14581a9b647451f16c2b242fceb270ab
+_md5_=6924f5f117cc98dbfd88b3ddf3fb530c
diff --git a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3 b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
index 43cf5b57e1dd..1ac2167f9807 100644
--- a/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
+++ b/metadata/md5-cache/sys-libs/libcap-ng-0.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=POSIX 1003.1e capabilities
 EAPI=5
 HOMEPAGE=http://people.redhat.com/sgrubb/libcap-ng/
 IUSE=python static-libs
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=python? ( dev-lang/python )
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.7.3.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	7aff825f110c83fa8c77f14ba3c71c47	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b56759441897b80db369b784a5e0ee12
+_md5_=9e2d905c51122a616534f13a6ecbef5c
diff --git a/metadata/md5-cache/sys-process/dcron-4.5-r1 b/metadata/md5-cache/sys-process/dcron-4.5-r1
index 1548f5288412..69c22fbf2e27 100644
--- a/metadata/md5-cache/sys-process/dcron-4.5-r1
+++ b/metadata/md5-cache/sys-process/dcron-4.5-r1
@@ -3,10 +3,10 @@ DEPEND=>=sys-apps/sed-4.0.5 virtual/pkgconfig
 DESCRIPTION=A cute little cron from Matt Dillon
 EAPI=4
 HOMEPAGE=http://www.jimpryor.net/linux/dcron.html http://apollo.backplane.com/FreeSrc/
-KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2
 RDEPEND=virtual/mta >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/cronie !sys-process/fcron
 SLOT=0
 SRC_URI=http://www.jimpryor.net/linux/releases/dcron-4.5.tar.gz
 _eclasses_=cron	7f2ced83f02bd3c752860bd108b62e2c	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	systemd	49c26d08111dd2c62b52cee32151b93b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=15122c407fb73040f416a092cbfcf911
+_md5_=253f7cab7ecbe14c03378ea41306f13c
diff --git a/metadata/md5-cache/www-apps/redmine-1.4.7 b/metadata/md5-cache/www-apps/redmine-1.4.7
deleted file mode 100644
index 9154cc7b2f11..000000000000
--- a/metadata/md5-cache/www-apps/redmine-1.4.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] virtual/rubygems[ruby_targets_ruby18] >=dev-ruby/rails-2.3.15:2.3[ruby_targets_ruby18] dev-ruby/i18n:0.4[ruby_targets_ruby18] >=dev-ruby/coderay-1.0.6[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.31[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby18] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby18] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby18] ) passenger? ( www-apache/passenger[ruby_targets_ruby18] ) ruby_targets_ruby18? ( >=dev-ruby/fastercsv-1.5[ruby_targets_ruby18] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-DESCRIPTION=Redmine is a flexible project management web application written using Ruby on Rails framework
-EAPI=4
-HOMEPAGE=http://www.redmine.org/
-IUSE=ldap openid imagemagick fastcgi passenger test elibc_FreeBSD ruby_targets_ruby18
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] virtual/rubygems[ruby_targets_ruby18] >=dev-ruby/rails-2.3.15:2.3[ruby_targets_ruby18] dev-ruby/i18n:0.4[ruby_targets_ruby18] >=dev-ruby/coderay-1.0.6[ruby_targets_ruby18] >=dev-ruby/tzinfo-0.3.31[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby18] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby18] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby18] ) passenger? ( www-apache/passenger[ruby_targets_ruby18] ) ruby_targets_ruby18? ( >=dev-ruby/fastercsv-1.5[ruby_targets_ruby18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
-REQUIRED_USE=|| ( ruby_targets_ruby18 )
-SLOT=0
-SRC_URI=mirror://rubyforge/redmine/redmine-1.4.7.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=d65f5eca84d8ada711c7da6af21c700f
diff --git a/metadata/md5-cache/www-apps/redmine-2.3.2 b/metadata/md5-cache/www-apps/redmine-2.3.2
new file mode 100644
index 000000000000..50e767baabb4
--- /dev/null
+++ b/metadata/md5-cache/www-apps/redmine-2.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] virtual/rubygems[ruby_targets_ruby18] >=dev-ruby/rails-3.2.13:3.2[ruby_targets_ruby18] >=dev-ruby/jquery-rails-2.0.2[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby18] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby18] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby18] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby18] ) passenger? ( www-apache/passenger[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby19] >=dev-ruby/rails-3.2.13:3.2[ruby_targets_ruby19] >=dev-ruby/jquery-rails-2.0.2[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby19] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby19] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby19] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby19] ) passenger? ( www-apache/passenger[ruby_targets_ruby19] ) ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+DESCRIPTION=Redmine is a flexible project management web application written using Ruby on Rails framework
+EAPI=4
+HOMEPAGE=http://www.redmine.org/
+IUSE=ldap openid imagemagick fastcgi passenger test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/fastercsv-1.5[ruby_targets_ruby18] ) ruby_targets_ruby18? ( virtual/ruby-ssl[ruby_targets_ruby18] virtual/rubygems[ruby_targets_ruby18] >=dev-ruby/rails-3.2.13:3.2[ruby_targets_ruby18] >=dev-ruby/jquery-rails-2.0.2[ruby_targets_ruby18] dev-ruby/i18n:0.6[ruby_targets_ruby18] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby18] dev-ruby/builder:3[ruby_targets_ruby18] dev-ruby/rake[ruby_targets_ruby18] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby18] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby18] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby18] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby18] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby18] ) passenger? ( www-apache/passenger[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby19] >=dev-ruby/rails-3.2.13:3.2[ruby_targets_ruby19] >=dev-ruby/jquery-rails-2.0.2[ruby_targets_ruby19] dev-ruby/i18n:0.6[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/builder:3[ruby_targets_ruby19] dev-ruby/rake[ruby_targets_ruby19] ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1[ruby_targets_ruby19] ) openid? ( >=dev-ruby/ruby-openid-2.1.4[ruby_targets_ruby19] >=dev-ruby/rack-openid-0.2.1[ruby_targets_ruby19] ) imagemagick? ( >=dev-ruby/rmagick-2[ruby_targets_ruby19] ) fastcgi? ( dev-ruby/fcgi[ruby_targets_ruby19] ) passenger? ( www-apache/passenger[ruby_targets_ruby19] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
+SLOT=0
+SRC_URI=mirror://rubyforge/redmine/redmine-2.3.2.tar.gz
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	63afaaed8aa819fdcb814c7cd39495a2	java-utils-2	6032f7ec6471c6459da900e11f0f7bf7	multilib	892e597faee02a5b94eb02ab512e7622	ruby-ng	69c01a1b984ed066bc91b4397b002f6a	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=bf328a95948dba140393002c37b01310
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.3.1 b/metadata/md5-cache/x11-libs/libxkbcommon-0.3.1
index 32db71360bac..17bcab5cdf45 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.3.1
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.3.1
@@ -4,9 +4,9 @@ DESCRIPTION=X.Org xkbcommon library
 EAPI=5
 HOMEPAGE=http://xorg.freedesktop.org/
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.3.1.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	0954dce983a8c7cfe4e2b55263cb7a05	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	17812f511eef87a499b62ab14e6aeaad
-_md5_=f8ef4ef29ca9bcaa1506ff0209eaa8ba
+_md5_=5621589ed21e3988a29379ae54469171
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.5 b/metadata/md5-cache/x11-misc/i3lock-2.5
index 6778cf1bef45..5a8e4c7940b1 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.5
+++ b/metadata/md5-cache/x11-misc/i3lock-2.5
@@ -3,10 +3,10 @@ DEPEND=virtual/pam dev-libs/libev >=x11-libs/libxkbcommon-0.3.1 x11-libs/libxkbf
 DESCRIPTION=Simple screen locker
 EAPI=5
 HOMEPAGE=http://i3wm.org/i3lock/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD
 RDEPEND=virtual/pam dev-libs/libev >=x11-libs/libxkbcommon-0.3.1 x11-libs/libxkbfile x11-libs/xcb-util x11-libs/libX11 x11-libs/cairo[xcb]
 SLOT=0
 SRC_URI=http://i3wm.org/i3lock/i3lock-2.5.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=0024d77a60f7d2c56f6a681952a5e29a
+_md5_=f3e9e35153ce333778ed214c0e6bc853
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-5.22 b/metadata/md5-cache/x11-misc/xscreensaver-5.22
index 5c7be270c5f2..06664bf4ec7e 100644
--- a/metadata/md5-cache/x11-misc/xscreensaver-5.22
+++ b/metadata/md5-cache/x11-misc/xscreensaver-5.22
@@ -4,10 +4,10 @@ DESCRIPTION=A modular screen saver and locker for the X Window System
 EAPI=5
 HOMEPAGE=http://www.jwz.org/xscreensaver/
 IUSE=gdm jpeg new-login opengl pam +perl selinux suid xinerama
-KEYWORDS=~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-xscreensaver ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 SLOT=0
 SRC_URI=http://www.jwz.org/xscreensaver/xscreensaver-5.22.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	63afaaed8aa819fdcb814c7cd39495a2	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	pam	5c1a9ef4892062f9ec25c8ef7c1f1e52	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fd18eecbd2323fecde46ed4abce693e
+_md5_=c2171467855dae0529b76d4bce430b46
diff --git a/metadata/md5-cache/x11-wm/i3-4.2 b/metadata/md5-cache/x11-wm/i3-4.2
deleted file mode 100644
index 0d6bbcc78fab..000000000000
--- a/metadata/md5-cache/x11-wm/i3-4.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb x11-libs/libXcursor x11-libs/libX11 x11-libs/startup-notification x11-libs/xcb-util app-text/xmlto app-text/asciidoc virtual/pkgconfig sys-devel/flex sys-devel/bison x11-proto/xcb-proto
-DESCRIPTION=An improved dynamic tiling window manager
-EAPI=4
-HOMEPAGE=http://i3wm.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb x11-libs/libXcursor x11-libs/libX11 x11-libs/startup-notification x11-libs/xcb-util x11-apps/xmessage
-SLOT=0
-SRC_URI=http://i3wm.org/downloads/i3-4.2.tar.bz2
-_eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=48c7ebbf06789c6ea4e7bd2b4ec2db0f
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 51f90b950ef2..91d08caf61e0 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Sep 2013 09:37:02 +0000
+Mon, 02 Sep 2013 20:06:59 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2176acdeb77d..65f086a9845c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Sep  2 09:37:00 UTC 2013
+Mon Sep  2 20:06:57 UTC 2013
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f8800cde12db..3550e0421089 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 02 Sep 2013 10:00:01 +0000
+Mon, 02 Sep 2013 20:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 24939e2beaea..b00061e393a8 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1378114501 Mon Sep  2 09:35:01 2013 UTC
+1378152301 Mon Sep  2 20:05:01 2013 UTC
diff --git a/net-dialup/sendpage/Manifest b/net-dialup/sendpage/Manifest
index 61d458920387..33a5fed0684d 100644
--- a/net-dialup/sendpage/Manifest
+++ b/net-dialup/sendpage/Manifest
@@ -1 +1 @@
-DIST sendpage-1.001.tar.gz 127130 RMD160 26a9fb7fa30a26deea32dc41ed4022ad689ffbc5 SHA1 d7804aa82ef80e7c17344de68efafbb75e9d2917 SHA256 2f2d8253b3f94fd3915ae7568a87e1263c416066f2cce7923b6dd3d2d5dc2b0c
+DIST sendpage-1.001.tar.gz 127130 SHA256 2f2d8253b3f94fd3915ae7568a87e1263c416066f2cce7923b6dd3d2d5dc2b0c SHA512 694f7eb8afd3a73d1322d51140b5eb473a3d697613a88d1b90fb0368e9eb25ec4cee8ed018841076fcd8370420d6c9f437f84af873b31cccb36c16f91a01cb3d WHIRLPOOL 8a3426a251eadad5d28c2ca2538d26af8476ea3b5dd497681a5e469f798a8d901aa9d0d2a422766fed485c366b16d46fed431cc60423e4b67c60bca130a1f0a4
diff --git a/net-dialup/sendpage/sendpage-1.1.0-r1.ebuild b/net-dialup/sendpage/sendpage-1.1.0-r2.ebuild
similarity index 70%
rename from net-dialup/sendpage/sendpage-1.1.0-r1.ebuild
rename to net-dialup/sendpage/sendpage-1.1.0-r2.ebuild
index 28edc983be5b..5105506f2806 100644
--- a/net-dialup/sendpage/sendpage-1.1.0-r1.ebuild
+++ b/net-dialup/sendpage/sendpage-1.1.0-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/sendpage/sendpage-1.1.0-r1.ebuild,v 1.6 2012/06/14 01:50:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/sendpage/sendpage-1.1.0-r2.ebuild,v 1.1 2013/09/02 15:29:57 idella4 Exp $
+
+EAPI=5
 
 inherit perl-module eutils user
 
@@ -13,6 +15,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+# This package warrants IUSE doc
 IUSE=""
 
 DEPEND="!net-misc/hylafax
@@ -22,18 +25,14 @@ DEPEND="!net-misc/hylafax
 	>=dev-perl/Net-SNPP-1.13
 	dev-perl/DBI"
 
-mydoc="FEATURES THANKS TODO email2page.conf sendpage.cf snpp.conf docs/*"
+mydoc="FEATURES email2page.conf sendpage.cf snpp.conf"
 
 pkg_setup() {
 	enewgroup sms
 	enewuser sendpage -1 -1 /var/spool/sendpage sms
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${PV}-makefile.patch )
 
 src_install() {
 	perl-module_src_install
@@ -42,4 +41,8 @@ src_install() {
 	newinitd "${FILESDIR}"/sendpage.initd sendpage
 	diropts -o sendpage -g sms -m0770
 	keepdir /var/spool/sendpage
+	# Separate docs/ content from ${mydoc[@]}
+	docompress -x /usr/share/doc/${PF}/text/
+	docinto text/
+	dodoc docs/*
 }
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
index 5a6748911883..f3162322c25e 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.9 2013/08/29 19:46:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.2.ebuild,v 1.10 2013/09/02 11:11:48 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -14,7 +14,7 @@ HOMEPAGE="https://live.gnome.org/gtk-vnc"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="examples +gtk3 +introspection pulseaudio python sasl vala"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-libs/liboauth/liboauth-1.0.1.ebuild b/net-libs/liboauth/liboauth-1.0.1.ebuild
index 1bb7f47e237c..252c5887cdaa 100644
--- a/net-libs/liboauth/liboauth-1.0.1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.7 2013/09/01 23:36:58 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/liboauth/liboauth-1.0.1.ebuild,v 1.8 2013/09/02 11:12:46 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="curl doc bindist +nss"
 
 PATCHES=( "${FILESDIR}"/${P}-doxygen-out-of-tree.patch )
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 1c19a0b16ab6..67a6548f395b 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -1,3 +1,4 @@
 DIST dbmail-3.0.2.tar.gz 867560 SHA256 139558f4fa3e0f460d688f6d29318366cc3f40dd570a1a29484bb580d0190c3e SHA512 ca1d30a114c1b2b8968227ed678e3857c6d5cb98eb9e7086d45c32b4e957396971bd76cfe2e278fe904fbe8a8ded53199ded76da300d9835b324839e42532834 WHIRLPOOL a79d8b344361bd032446e99bbbb865e798db54e60a730cb7191112e4320ca130d194d8a1ad2d676673b2bb06e50e9cc1ccc78a8a1fc7edcb2a9b3eeeb7841500
 DIST dbmail-3.1.2.tar.gz 2393373 SHA256 9231042ab345275f8704a69186a5e2531126d2890342dd5436bf51def75d760d SHA512 226aece1072882ea63254f9cd03d5f444e13c4075cd3fc1ca6b87032e29abbf16367433a7eeb91b1b22c6293294a313fc7626a32275d87475713057e070c00b5 WHIRLPOOL 06ba486e26f8ef07361012c187a6a5f43b7ce2e5e18a845a95ee6831d8013bed7c7e649975c3f7f9c36274aad61a0ee504e3fc1446ba8fde3a4765bfcd57bc84
 DIST dbmail-3.1.3.tar.gz 2392630 SHA256 508d288f3c5690387eeed94669f96cbd4cc686066bfd4cb9a5f97ec63c7ca304 SHA512 09c4d1741e062381c6bd11a510e0691c66b1683626ae57640a3470b8a2994d0492b7e2b67399cec890456f198cc95c16bc9e0952e975b31126819206965d6ad3 WHIRLPOOL ed40d90491993a9dbde046ed97c31233ae571b23a538640da26083d94bfa9040391011358baa9373e1b376929966e02e6fb4f2ae8d02a69a2cfd5e7a72b14496
+DIST dbmail-3.1.4.tar.gz 2393666 SHA256 1821474166d2b73ac89264f5aeffb5c0f8f6e94f13d74bd7e6a9e531a5672a59 SHA512 6168e6279df3516242fc11f81ec5c54af2dccf86aabe1c92ca16a69ebcd499e68fe5f7703b175e1a5674c198cb1fdab9bb157e840a1bee896e76ffb260dcdf30 WHIRLPOOL c5cd550977560743bbf15ab30d1eb7bcf3d0a5badde3114573594392291de03deb01fe976b36436ece3982a39854364457a46b0a2ee590a6275bef1a5dbcbedb
diff --git a/net-mail/dbmail/dbmail-3.1.4.ebuild b/net-mail/dbmail/dbmail-3.1.4.ebuild
new file mode 100644
index 000000000000..e46d1ecb892f
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.1.4.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-3.1.4.ebuild,v 1.1 2013/09/02 11:46:03 lordvan Exp $
+
+EAPI="4"
+inherit eutils multilib versionator
+
+DESCRIPTION="DBMail is an open-source project that enables storage of mail messages in a relational database."
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="http://www.dbmail.org/download/$(get_version_component_range 1-2)/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap sieve +sqlite ssl static"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	>=dev-libs/gmime-2.4.6:2.4
+	>=dev-libs/glib-2.16
+	dev-libs/libevent
+	ssl? ( dev-libs/openssl )"
+#asciidoc and xmlto needed?
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup dbmail
+	enewuser dbmail -1 -1 /var/lib/dbmail dbmail
+}
+
+src_configure() {
+	local myconf=""
+	use ldap && myconf=${myconf}" --with-auth-ldap"
+
+	econf \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable static) \
+		$(use_with sieve) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS BUGS ChangeLog README* INSTALL NEWS THANKS UPGRADING
+
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf
+	sed -i -e "s:/var/run:/var/run/dbmail:" dbmail.conf
+	#sed -i -e "s:#library_directory:library_directory:" dbmail.conf
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail
+	sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail
+	sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail
+	newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+	#doman man/*.{1,5,8}
+
+	# ldap schema
+	if use ldap; then
+	   insinto /etc/openldap/schema
+	   doins "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+	keepdir /var/run/dbmail
+	fowners dbmail:dbmail /var/run/dbmail
+}
+
+pkg_postinst() {
+	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+	echo
+	elog "We are now using the init script from upstream."
+	elog "Please edit /etc/conf.d/dbmail to set which services to start"
+	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
+	elog "forget to rc-update del dbmail-* first)"
+	echo
+	elog "Changed pid directory to /var/run/dbmail (see"
+	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
+	echo
+	ewarn "The database config has changed to support libzdb db URI"
+	ewarn "Please check the documentation (or Bug #479664)"
+	echo
+	ewarn "The database schema has changed since 3.0.x make sure"
+	ewarn "to run the migration script"
+	echo
+}
diff --git a/net-mail/dovecot/dovecot-2.2.5.ebuild b/net-mail/dovecot/dovecot-2.2.5.ebuild
index 9c0150168e61..9a78dad9b820 100644
--- a/net-mail/dovecot/dovecot-2.2.5.ebuild
+++ b/net-mail/dovecot/dovecot-2.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.5.ebuild,v 1.8 2013/08/29 19:52:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/dovecot-2.2.5.ebuild,v 1.9 2013/09/02 11:14:20 ago Exp $
 
 EAPI=5
 inherit eutils multilib ssl-cert systemd user versionator
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-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_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
 IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
diff --git a/net-nds/openldap/openldap-2.4.35.ebuild b/net-nds/openldap/openldap-2.4.35.ebuild
index 321eae99a22f..c66efd4189e3 100644
--- a/net-nds/openldap/openldap-2.4.35.ebuild
+++ b/net-nds/openldap/openldap-2.4.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35.ebuild,v 1.5 2013/08/31 14:49:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.35.ebuild,v 1.6 2013/09/02 11:13:04 ago Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE_DAEMON="crypt icu samba slp tcpd experimental minimal"
 IUSE_BACKEND="+berkdb"
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 61505e074b05..a496ebec453e 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,11 +1,13 @@
 # Copyright 1999-2013 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.133 2013/09/01 14:31:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/package.use.mask,v 1.134 2013/09/02 17:13:42 pacho Exp $
 
 # Pacho Ramos <pacho@gentoo.org> (01 Sep 2013)
 # CONFIG_AUDITSYSCALL=y is not implemented, bug #438368
 sys-apps/systemd pam
 sys-auth/consolekit pam
+sys-auth/pambase consolekit
+sys-auth/polkit pam
 
 # Pacho Ramos <pacho@gentoo.org> (25 Jul 2013)
 # Missing keywords, bug #444688
diff --git a/profiles/package.mask b/profiles/package.mask
index c7638596f230..2922da8b1d1a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,6 +1,6 @@
 ####################################################################
 
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15081 2013/08/31 19:46:19 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15082 2013/09/02 19:49:29 tetromino Exp $
 #
 # When you add an entry to the top of this file, add your name, the date, and
 # an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,10 @@
 
 #--- END OF EXAMPLES ---
 
+# Alexandre Rostovtsev <tetromino@gentoo.org> (02 Sep 2013)
+# Silent API/ABI change; mask until seahorse is patched; bug #483414
+>=app-crypt/libsecret-0.16
+
 # Tom Wijsman <TomWij@gentoo.org> (28 Aug 2013)
 # Gentoo sources 3.8.13 masked due to security bug #475618: CVE-2013-1059:
 # Linux Kernel Ceph NULL Pointer Dereference Denial of Service Vulnerability
diff --git a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
index 1c116bf24033..8753cd3904b2 100644
--- a/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
+++ b/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild,v 1.9 2013/09/02 00:04:47 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap-ng/libcap-ng-0.7.3.ebuild,v 1.10 2013/09/02 11:10:56 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://people.redhat.com/sgrubb/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~arm-linux ~x86-linux"
 IUSE="python static-libs"
 
 RDEPEND="python? ( dev-lang/python )"
diff --git a/sys-process/dcron/dcron-4.5-r1.ebuild b/sys-process/dcron/dcron-4.5-r1.ebuild
index 3adb48493ca7..5781cf4d763a 100644
--- a/sys-process/dcron/dcron-4.5-r1.ebuild
+++ b/sys-process/dcron/dcron-4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/dcron-4.5-r1.ebuild,v 1.7 2013/08/29 19:53:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/dcron-4.5-r1.ebuild,v 1.8 2013/09/02 11:13:41 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.jimpryor.net/linux/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/www-apps/redmine/Manifest b/www-apps/redmine/Manifest
index 16be280b3f67..628dcb4c2f95 100644
--- a/www-apps/redmine/Manifest
+++ b/www-apps/redmine/Manifest
@@ -1,2 +1,2 @@
-DIST redmine-1.4.7.tar.gz 3676293 SHA256 949bd0d88c12f7a77a6a9a47401478a733c9d0c07fea31fa334944e901f26349 SHA512 291d33266542445e1cc8d6a38d342fa098d59c34fb93c59f15531fbe17f33eb19cd5846caa3dbd5c0b358da1bd433098f807aeb2f9c1516aca150409164a6ef8 WHIRLPOOL 401acf393e2900bcc62427565337ddaaea10a2b8dda1b11ea5e28519ddc7356bc6a8823ab4c148afc0a76ae21f3aa2b6a87722c9f47da78c13466225e117a4a4
 DIST redmine-2.2.4.tar.gz 3754826 SHA256 8465eb42865f7b5972a27fd66f08678244a77f7fc495ccb99978fbdbf8968d7f SHA512 d6ed394de71db1b98d22f47e105b698c798d84887161977d264f1629e8d5e917a0f24fd633378c855243609d9b318d81a81dc4d703198f043a24f01fcbdd6024 WHIRLPOOL fcd3c79dfab006f2eade4d9ae3d6d987731a7e21a7c51727fb184291e98364f6be7b96452ebd33419565069a2cc757d5f2b606ba8c2dcca3d4b685067b333f1b
+DIST redmine-2.3.2.tar.gz 3801029 SHA256 dc3f86f2ac591c6d0886d183b68604aa80fc90d412bdeab0c3a57c9cd7b43384 SHA512 e7dbf520762db204f8aca8940b429ca004e96f7f5175dcc261e2d96e2d730714189bce3dce91374cd360968250239680894872af459986e97ed76700e496d699 WHIRLPOOL fa3d802cdbebacb84dd91af105a34c40dfeef1f4232b5780cd8ef7a8a0adbed817a96e63ae62415c526e73ff4b5132b698eaad530a91213bdd1fd572c20df76b
diff --git a/www-apps/redmine/files/redmine-1.4.1-bundler.patch b/www-apps/redmine/files/redmine-1.4.1-bundler.patch
deleted file mode 100644
index adef29a24226..000000000000
--- a/www-apps/redmine/files/redmine-1.4.1-bundler.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurb redmine-1.4.1.orig/config/boot.rb redmine-1.4.1/config/boot.rb
---- redmine-1.4.1.orig/config/boot.rb	2012-04-20 19:01:56.000000000 +0900
-+++ redmine-1.4.1/config/boot.rb	2012-04-25 13:00:01.702911764 +0900
-@@ -41,11 +41,6 @@
-   class Boot
-     def run
-       load_initializer
--      Rails::Initializer.class_eval do
--        def load_gems
--          @bundler_loaded ||= Bundler.require :default, Rails.env
--        end
--      end
-       Rails::Initializer.run(:set_load_path)
-     end
-   end
diff --git a/www-apps/redmine/files/redmine-2.initd b/www-apps/redmine/files/redmine-2.initd
index f4fcdb20512a..e377788b2ccc 100644
--- a/www-apps/redmine/files/redmine-2.initd
+++ b/www-apps/redmine/files/redmine-2.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.3 2013/05/13 10:32:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine-2.initd,v 1.4 2013/09/02 14:13:44 pva Exp $
 
 RAILS_ENV=${RAILS_ENV:-production}
 REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
@@ -9,7 +9,7 @@ REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
 REDMINE_PORT=${REDMINE_PORT:-3000}
 REDMINE_USER=${REDMINE_USER:-redmine}
 REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="/run/redmine/server.pid"
+REDMINE_PIDFILE="/var/run/redmine/server.pid"
 
 depend() {
 	use apache2 git-daemon mysql net postgresql svnserve
@@ -23,9 +23,8 @@ start_pre() {
 		eerror
 		return 1
 	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
+	if [ ! -d /var/run/redmine ]; then
+		checkpath -q -d -m 0755 -o redmine:redmine /var/run/redmine
 	fi
 }
 
@@ -37,7 +36,7 @@ start() {
 		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/rails server -- \
 		--daemon --environment=${RAILS_ENV} \
 		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		--pid "${REDMINE_PIDFILE}" \
+		--pid="${REDMINE_PIDFILE}" \
 		${REDMINE_OPTS}
 	eend $?
 }
diff --git a/www-apps/redmine/files/redmine.initd b/www-apps/redmine/files/redmine.initd
deleted file mode 100644
index 49d59301492d..000000000000
--- a/www-apps/redmine/files/redmine.initd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/files/redmine.initd,v 1.5 2013/05/13 10:32:29 pva Exp $
-
-RAILS_ENV=${RAILS_ENV:-production}
-REDMINE_DIR=${REDMINE_DIR:-/var/lib/redmine}
-REDMINE_ADDRESS=${REDMINE_ADDRESS:-localhost}
-REDMINE_PORT=${REDMINE_PORT:-3000}
-REDMINE_USER=${REDMINE_USER:-redmine}
-REDMINE_GROUP=${REDMINE_GROUP:-redmine}
-REDMINE_PIDFILE="/run/redmine/server.pid"
-
-depend() {
-	use apache2 git-daemon mysql net postgresql svnserve
-}
-
-start_pre() {
-	if [ ! -e "${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
-		eerror "Execute the following command to initlize environment:"
-		eerror
-		eerror "# emerge --config www-apps/redmine"
-		eerror
-		return 1
-	fi
-
-	if [ ! -d /run/redmine ]; then
-		checkpath -q -d -m 0755 -o redmine:redmine /run/redmine
-	fi
-}
-
-start() {
-	ebegin "Starting redmine"
-	cd "${REDMINE_DIR}"
-	start-stop-daemon --start --quiet --user ${REDMINE_USER}:${REDMINE_GROUP} \
-		--pidfile "${REDMINE_PIDFILE}" \
-		--exec /usr/bin/ruby "${REDMINE_DIR}"/script/server -- \
-		--daemon --environment=${RAILS_ENV} \
-		--binding=${REDMINE_ADDRESS} --port=${REDMINE_PORT} \
-		${REDMINE_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping redmine"
-	cd "${REDMINE_DIR}"
-	start-stop-daemon --signal INT --quiet --pidfile "${REDMINE_PIDFILE}"
-	eend $?
-}
diff --git a/www-apps/redmine/redmine-1.4.7.ebuild b/www-apps/redmine/redmine-2.3.2.ebuild
similarity index 75%
rename from www-apps/redmine/redmine-1.4.7.ebuild
rename to www-apps/redmine/redmine-2.3.2.ebuild
index 2995fcf50dd3..b2fda1992dcf 100644
--- a/www-apps/redmine/redmine-1.4.7.ebuild
+++ b/www-apps/redmine/redmine-2.3.2.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-1.4.7.ebuild,v 1.1 2013/05/11 21:29:22 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/redmine/redmine-2.3.2.ebuild,v 1.1 2013/09/02 14:13:43 pva Exp $
 
 EAPI="4"
-# rails:2.3 isn't available for ruby19 on Gentoo
-#USE_RUBY="ruby18 ruby19"
-USE_RUBY="ruby18"
+USE_RUBY="ruby18 ruby19"
 inherit eutils depend.apache ruby-ng
 
 DESCRIPTION="Redmine is a flexible project management web application written using Ruby on Rails framework"
@@ -21,22 +19,27 @@ SLOT="0"
 IUSE="ldap openid imagemagick fastcgi passenger"
 
 #RDEPEND="$(ruby_implementation_depend jruby '>=' -1.6.7)[ssl]"
+RDEPEND="
+	ruby_targets_ruby18? (
+		>=dev-ruby/fastercsv-1.5[ruby_targets_ruby18]
+	)"
 
 ruby_add_rdepend "virtual/ruby-ssl
 	virtual/rubygems
-	>=dev-ruby/rails-2.3.15:2.3
-	dev-ruby/i18n:0.4
-	>=dev-ruby/coderay-1.0.6
-	>=dev-ruby/tzinfo-0.3.31
+	>=dev-ruby/rails-3.2.13:3.2
+	>=dev-ruby/jquery-rails-2.0.2
+	dev-ruby/i18n:0.6
+	>=dev-ruby/coderay-1.0.9
+	dev-ruby/builder:3
 	dev-ruby/rake
 	ldap? ( >=dev-ruby/ruby-net-ldap-0.3.1 )
-	openid? ( >=dev-ruby/ruby-openid-2.1.4 )
+	openid? (
+		>=dev-ruby/ruby-openid-2.1.4
+		>=dev-ruby/rack-openid-0.2.1
+	)
 	imagemagick? ( >=dev-ruby/rmagick-2 )
 	fastcgi? ( dev-ruby/fcgi )
-	passenger? ( www-apache/passenger )
-	ruby_targets_ruby18? (
-		>=dev-ruby/fastercsv-1.5
-	)"
+	passenger? ( www-apache/passenger )"
 #	ruby_targets_ruby18? (
 #		>=dev-ruby/fastercsv-1.5
 #		postgres? ( >=dev-ruby/pg-0.11 )
@@ -46,7 +49,7 @@ ruby_add_rdepend "virtual/ruby-ssl
 #	ruby_targets_ruby19? (
 #		postgres? ( >=dev-ruby/pg-0.11 )
 #		sqlite3? ( dev-ruby/sqlite3 )
-#		mysql? ( dev-ruby/mysql2:0.2 )
+#		mysql? ( dev-ruby/mysql2:0.3 )
 #	)
 #	ruby_targets_jruby? (
 #		dev-ruby/jruby-openssl
@@ -57,18 +60,12 @@ ruby_add_rdepend "virtual/ruby-ssl
 #	)
 
 #ruby_add_bdepend ">=dev-ruby/rdoc-2.4.2
+#	dev-ruby/yard
 #	test? (
-#		!ruby_targets_ruby19? (
-#			>=dev-ruby/shoulda-2.11
-#		)
-#		ruby_targets_ruby19? (
-#			dev-ruby/test-unit
-#		)
-#		ruby_targets_jruby? (
-#			dev-ruby/test-unit
-#		)
-#		>=dev-ruby/edavis10-object_daddy
-#		=dev-ruby/mocha-0.12*
+#		>=dev-ruby/shoulda-3.3.2
+#		>=dev-ruby/mocha-0.13.3
+#		>=dev-ruby/capybara-2.0.0
+#		<dev-ruby/nokogiri-1.6.0
 #	)"
 
 REDMINE_DIR="/var/lib/${PN}"
@@ -85,10 +82,14 @@ all_ruby_prepare() {
 	rm .gitignore .hgignore || die
 
 	rm Gemfile config/preinitializer.rb || die
-	epatch "${FILESDIR}/${PN}-1.4.1-bundler.patch"
 
 	echo "CONFIG_PROTECT=\"${EPREFIX}${REDMINE_DIR}/config\"" > "${T}/50${PN}"
 	echo "CONFIG_PROTECT_MASK=\"${EPREFIX}${REDMINE_DIR}/config/locales ${EPREFIX}${REDMINE_DIR}/config/settings.yml\"" >> "${T}/50${PN}"
+
+	# remove openid module in case openid is disabled
+	use openid || rm -r lib/plugins/open_id_authentication || die
+	# remove ldap staff module to avoid #413779
+	use ldap || rm app/models/auth_source_ldap.rb || die
 }
 
 all_ruby_install() {
@@ -121,20 +122,20 @@ all_ruby_install() {
 		"${REDMINE_DIR}/tmp" \
 		/var/log/${PN}
 
-	if use passenger ; then
+	if use passenger; then
 		has_apache
 		insinto "${APACHE_VHOSTS_CONFDIR}"
 		doins "${FILESDIR}/10_redmine_vhost.conf"
 	else
 		newconfd "${FILESDIR}/${PN}.confd" ${PN}
-		newinitd "${FILESDIR}/${PN}.initd" ${PN}
+		newinitd "${FILESDIR}/${PN}-2.initd" ${PN}
 	fi
 	doenvd "${T}/50${PN}"
 }
 
 pkg_postinst() {
 	einfo
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" -o -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		elog "Execute the following command to upgrade environment:"
 		elog
 		elog "# emerge --config \"=${CATEGORY}/${PF}\""
@@ -157,17 +158,29 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ] ; then
+	if [ ! -e "${EPREFIX}${REDMINE_DIR}/config/database.yml" ]; then
 		eerror "Copy ${EPREFIX}${REDMINE_DIR}/config/database.yml.example to ${EPREFIX}${REDMINE_DIR}/config/database.yml"
 		eerror "then edit this file in order to configure your database settings for \"production\" environment."
 		die
 	fi
 
 	local RAILS_ENV=${RAILS_ENV:-production}
-	local RUBY=${RUBY:-ruby18}
+	if [ ! -L /usr/bin/ruby ]; then
+		eerror "/usr/bin/ruby is not a valid symlink to any ruby implementation."
+		eerror "Please update it via `eselect ruby`"
+		die
+	fi
+	local RUBY=${RUBY:-ruby}
 
 	cd "${EPREFIX}${REDMINE_DIR}" || die
-	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ] ; then
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/session_store.rb" ]; then
+		einfo
+		einfo "Generating secret token."
+		einfo
+		rm config/initializers/session_store.rb || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake generate_secret_token || die
+	fi
+	if [ -e "${EPREFIX}${REDMINE_DIR}/config/initializers/secret_token.rb" ]; then
 		einfo
 		einfo "Upgrading database."
 		einfo
@@ -175,8 +188,7 @@ pkg_config() {
 		einfo "Migrating database."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Upgrading the plugin migrations."
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate:upgrade_plugin_migrations # || die
-		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate_plugins || die
+		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake redmine:plugins:migrate || die
 		einfo "Clear the cache and the existing sessions."
 		${RUBY} -S rake tmp:cache:clear || die
 		${RUBY} -S rake tmp:sessions:clear || die
@@ -186,7 +198,7 @@ pkg_config() {
 		einfo
 
 		einfo "Generating a session store secret."
-		${RUBY} -S rake generate_session_store || die
+		${RUBY} -S rake generate_secret_token || die
 		einfo "Creating the database structure."
 		RAILS_ENV="${RAILS_ENV}" ${RUBY} -S rake db:migrate || die
 		einfo "Populating database with default configuration dat."
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild
index 47119a2fdde8..cfb566831921 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild,v 1.2 2013/07/13 14:34:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild,v 1.3 2013/09/02 16:17:12 nimiux Exp $
 
 EAPI=5
 XORG_EAUTORECONF="yes"
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 else
 	XORG_BASE_INDIVIDUAL_URI=""
 	SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 inherit xorg-2 ${GIT_ECLASS}
diff --git a/x11-misc/i3lock/i3lock-2.5.ebuild b/x11-misc/i3lock/i3lock-2.5.ebuild
index 30aeeeb76e25..40cfd54918e4 100644
--- a/x11-misc/i3lock/i3lock-2.5.ebuild
+++ b/x11-misc/i3lock/i3lock-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/i3lock-2.5.ebuild,v 1.2 2013/06/11 19:13:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/i3lock/i3lock-2.5.ebuild,v 1.3 2013/09/02 16:19:04 nimiux Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/pam
diff --git a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
index 421dbdc8c141..042b737ba29e 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.22.ebuild,v 1.8 2013/08/29 19:49:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.22.ebuild,v 1.9 2013/09/02 11:14:59 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic multilib pam
@@ -11,7 +11,7 @@ SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="dev-libs/libxml2
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index c32f824abe36..150e6e72bcae 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,3 +1,2 @@
-DIST i3-4.2.tar.bz2 758109 SHA256 e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b SHA512 21ef5c6b9e3249195c983ad14ab545c18622b17926e96f14850792d688598683b80a22d7e5b770126e34b265699de5e87a88d1f9b26ab2bd7762bad46d5447f2 WHIRLPOOL 0b7d9e4301d035d2406351b87e8eecc1e2b1df14b45b46bea5086ea260b31c0fa85f3e47e20e55797dc6ce70aa0232e4d17e2d1da4d7fe3dc842eea186f6cde5
 DIST i3-4.5.1.tar.bz2 878954 SHA256 bae55f1c7c4a21d71aae182e4fab6038ba65ba4be5d1ceff9e269f4f74b823f2 SHA512 2e62b7b4057d3276bf64fb4ea6ad0238166d748fac2069189d63532cdf9d4e1c3bc4c871c0459a4496d40afc55b086b39e96acebfaf9cabfb245525392869b08 WHIRLPOOL 40cefb1147ace1e891debbaf8fcdf321d372b0a6d4076aa4eb1d58269f9ec866c8f57026ff2bf307bd5492b86acc730843fd42e933b760524d982bef1c4b5bec
 DIST i3-4.6.tar.bz2 891862 SHA256 f5d2118441cec8b623d18610f3793c55df9da6af15b4df8523e86309096956e1 SHA512 914bb755b65c57051636c4a81cf3db5d6c32c9cf30b544affc9213748babea2f3365c51c80e8c489911f358f8439b21efda0742bb2e2ef5ecb89d37bef898b02 WHIRLPOOL 2d7dde5d6d23e6c6418ac4b8b34dc8028c0c275d5b5b0fd6fbb1a6c19420c7d623f2356350b8dcd9aa8cdcebc598ccc30e06f96cb546a18d35f6aa5ab34112d1
diff --git a/x11-wm/i3/i3-4.2.ebuild b/x11-wm/i3/i3-4.2.ebuild
deleted file mode 100644
index ce76d72afa01..000000000000
--- a/x11-wm/i3/i3-4.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.2.ebuild,v 1.5 2012/09/13 20:13:02 xarthisius Exp $
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="An improved dynamic tiling window manager"
-HOMEPAGE="http://i3wm.org/"
-SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="dev-libs/libev
-	dev-libs/libpcre
-	dev-libs/yajl
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libX11
-	x11-libs/startup-notification
-	x11-libs/xcb-util"
-DEPEND="${CDEPEND}
-	app-text/xmlto
-	app-text/asciidoc
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/bison
-	x11-proto/xcb-proto"
-RDEPEND="${CDEPEND}
-	x11-apps/xmessage"
-
-DOCS=( RELEASE-NOTES-${PV} )
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	sed -i common.mk \
-		-e "/DEBUG=/ s/1/0/" \
-		-e '/O2\|reorder\-blocks\|SILENT/d' || die
-
-	cat <<- EOF > "${T}"/i3wm
-		#!/bin/sh
-		exec /usr/bin/i3
-	EOF
-}
-
-src_install() {
-	default
-	dohtml -r docs/*
-	doman i3bar/doc/i3bar.1 man/*.1
-	exeinto /etc/X11/Sessions
-	doexe "${T}"/i3wm
-}
-
-pkg_postinst() {
-	einfo "There are several packages that you may find useful with ${PN} and"
-	einfo "their usage is suggested by the upstream maintainers, namely:"
-	einfo "  x11-misc/dmenu"
-	einfo "  x11-misc/i3status"
-	einfo "  x11-misc/i3lock"
-	einfo "Please refer to their description for additional info."
-}