diff --git a/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
new file mode 100644
index 000000000000..ce818fcd3e77
--- /dev/null
+++ b/app-admin/procinfo-ng/files/procinfo-ng-2.0.304-man.patch
@@ -0,0 +1,11 @@
+--- procinfo-ng-2.0.217/procinfo.8.orig	2009-01-11 11:21:23.000000000 +0100
++++ procinfo-ng-2.0.217/procinfo.8	2009-01-11 11:21:48.000000000 +0100
+@@ -6,7 +6,7 @@
+ .SH SYNOPSIS
+ .B procinfo
+ [
+-.IR \-fdDSbrhv
++.IR \-dDSbrhv
+ ] [
+ .IR \-n N
+ ]
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index c8cc7b21ad8b..4a00a64b40ae 100644
--- a/app-admin/procinfo-ng/metadata.xml
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>jlec@gentoo.org</email>
-</maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
new file mode 100644
index 000000000000..ab7e3b0c65d4
--- /dev/null
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild,v 1.1 2014/11/06 08:25:06 jlec Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Completely rewrite of the old system monitoring app procinfo"
+HOMEPAGE="http://sourceforge.net/projects/procinfo-ng/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/ncurses
+	!app-admin/procinfo"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-as-needed.patch
+	"${FILESDIR}"/${P}-man.patch
+	)
+
+src_prepare() {
+	epatch ${PATCHES[@]}
+	# removing -s flag as portage does the stripping part and add support
+	# for custom LDFLAGS. Plus correct for --as-needed
+	sed \
+		-e 's:-s -lncurses:${LDFLAGS}:' \
+		-i configure.in || die "sed configure.in failed"
+	eautoreconf
+}
+
+src_compile() {
+	emake LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)"
+}
diff --git a/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
index dce91e60dee3..9965e30681b7 100644
--- a/app-admin/pwgen/pwgen-2.07.ebuild
+++ b/app-admin/pwgen/pwgen-2.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.07.ebuild,v 1.1 2014/11/05 16:17:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/pwgen/pwgen-2.07.ebuild,v 1.2 2014/11/06 10:49:11 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="livecd"
 
 src_prepare() {
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
index 813900c11d16..0e8c50a9bff2 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.4 2014/11/04 20:30:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0-r1.ebuild,v 1.5 2014/11/06 10:46:40 jer Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/libp11/libp11-0.2.8.ebuild b/dev-libs/libp11/libp11-0.2.8.ebuild
index 9c0444a84949..c812368966c2 100644
--- a/dev-libs/libp11/libp11-0.2.8.ebuild
+++ b/dev-libs/libp11/libp11-0.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8.ebuild,v 1.14 2014/11/05 16:11:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libp11/libp11-0.2.8.ebuild,v 1.15 2014/11/06 05:36:45 vapier Exp $
 
 EAPI="4"
 inherit libtool
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="doc"
 
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="dev-libs/openssl
-	dev-libs/libltdl"
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/openct/openct-0.6.20-r3.ebuild b/dev-libs/openct/openct-0.6.20-r3.ebuild
index 37a4a11cd692..a1ecc1686320 100644
--- a/dev-libs/openct/openct-0.6.20-r3.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.13 2014/08/08 08:00:56 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r3.ebuild,v 1.14 2014/11/06 05:36:49 vapier Exp $
 
 EAPI=5
 
@@ -16,10 +16,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc pcsc-lite usb debug +udev"
 
-# libtool is required at runtime for libltdl
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 )
 	usb? ( virtual/libusb:0 )
-	sys-devel/libtool"
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index 44d1d71dd5e0..e3c32bfd5451 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r4.ebuild,v 1.1 2014/11/05 16:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openct/openct-0.6.20-r4.ebuild,v 1.2 2014/11/06 05:36:49 vapier Exp $
 
 EAPI=5
 
@@ -16,9 +16,10 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc pcsc-lite usb debug +udev"
 
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 )
 	usb? ( virtual/libusb:0 )
-	dev-libs/libltdl"
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
 
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
diff --git a/dev-libs/opensc/opensc-0.12.2-r2.ebuild b/dev-libs/opensc/opensc-0.12.2-r2.ebuild
index 294c36cdee3d..e29600a3ac24 100644
--- a/dev-libs/opensc/opensc-0.12.2-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.9 2014/11/05 16:13:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r2.ebuild,v 1.10 2014/11/06 05:38:04 vapier Exp $
 
 EAPI=4
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
 IUSE="doc libtool +pcsc-lite openct readline ssl zlib"
 
-RDEPEND="libtool? ( dev-libs/libltdl )
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="libtool? ( || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) )
 	zlib? ( sys-libs/zlib )
 	readline? ( sys-libs/readline )
 	ssl? ( dev-libs/openssl )
diff --git a/dev-libs/redland/redland-1.0.15.ebuild b/dev-libs/redland/redland-1.0.15.ebuild
index 80903668a13b..b0a02213ca6c 100644
--- a/dev-libs/redland/redland-1.0.15.ebuild
+++ b/dev-libs/redland/redland-1.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild,v 1.15 2014/11/05 16:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.15.ebuild,v 1.16 2014/11/06 05:40:32 vapier Exp $
 
 EAPI=4
 inherit libtool
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-libs/redland/redland-1.0.16.ebuild b/dev-libs/redland/redland-1.0.16.ebuild
index e0e4e34d7f55..3779be04123a 100644
--- a/dev-libs/redland/redland-1.0.16.ebuild
+++ b/dev-libs/redland/redland-1.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v 1.16 2014/11/05 16:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.16.ebuild,v 1.17 2014/11/06 05:40:32 vapier Exp $
 
 EAPI=4
 inherit db-use libtool
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs +xml"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-libs/redland/redland-1.0.17-r1.ebuild b/dev-libs/redland/redland-1.0.17-r1.ebuild
index f1466b1b8426..2c4e230d9bca 100644
--- a/dev-libs/redland/redland-1.0.17-r1.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17-r1.ebuild,v 1.1 2014/11/05 16:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17-r1.ebuild,v 1.2 2014/11/06 05:40:32 vapier Exp $
 
 EAPI=5
 inherit db-use libtool
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-libs/redland/redland-1.0.17.ebuild b/dev-libs/redland/redland-1.0.17.ebuild
index c5bed6bbf10c..56905c817ff2 100644
--- a/dev-libs/redland/redland-1.0.17.ebuild
+++ b/dev-libs/redland/redland-1.0.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild,v 1.3 2014/11/05 16:16:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/redland/redland-1.0.17.ebuild,v 1.4 2014/11/06 05:40:32 vapier Exp $
 
 EAPI=5
 inherit db-use libtool
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos"
 IUSE="berkdb iodbc mysql odbc postgres sqlite static-libs"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	mysql? ( virtual/mysql )
 	sqlite? ( =dev-db/sqlite-3* )
 	berkdb? ( sys-libs/db )
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 4c61aa58a1bb..995d348e5fd1 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -8,3 +8,4 @@ DIST apsw-3.8.3.1_p1.tar.gz 302356 SHA256 ddbaf6fd45162b103f26ae9a1b48ba84174cf9
 DIST apsw-3.8.4.1_p1.tar.gz 302791 SHA256 6e06f48ecfc0a5d518122f75d8e74cb2978de8ec80674057df63cb4cae8289d0 SHA512 24340e9898088cac14dfd25e3a44a7a986aa00088087658c8c9dc04c7db2065c9ad8d2f0a176d38fa098da5b22aa62dd5a49c8bd9e28096358f9c37d0b04964a WHIRLPOOL 8ef224f9a6eea831267a20ba6aa28e27e972289f8349da6b2a54d6c62a0e9c639a5a539651c293a2d47e0e72fb74a311dcfed9e07319ef9e7298a36bcd7c3a7d
 DIST apsw-3.8.4.3_p1.tar.gz 303203 SHA256 6f119be599af7c7c342820ebf429381741101531c387dad323b8729eee06cd35 SHA512 0ba33febe7fb7eb2e28c4ca48c6924532e7c05b883c3432b22ce958604c8a1cd85a48e697971b0649a64103ec9cc8f0fee4fe512934b3d608f5afcab45205363 WHIRLPOOL 797eda23380053afb0981038afd41a250bfe25163cb8816f84c6db5a0ed761efd3a1d8821c755c73ef24f5e219f73dbfa236260d86630ae041ad1212d1bcfe7f
 DIST apsw-3.8.5_p1.tar.gz 303479 SHA256 f828556f88926eff858e7b5a43e36edd18ed2c1c62c6925a60aa5ed5aa1f96cd SHA512 f62f3c3bbb39ffe63d1eaaeacf7a3e7562e4964774047923cce7fae2f947a14b41b51ee93546a15b27dde216b009e0fd8664bf86569ec94cb8f9f16d2d6e245f WHIRLPOOL 85390d53bba173f1b1118675830743cf282325f73bf5bf8d7205d954fbac37755c502a0c0e48ba5e1463a9a30d7832ae78dea5818e3f99c26e5638c2eb625822
+DIST apsw-3.8.7.1_p1.tar.gz 303446 SHA256 7aee29cc170332aa1a16fb80753152e809208bbc91823f64178e4afc32526fec SHA512 104aad3a8cec07647b71c77814cc069587daf84450b41f992d0b3c752c476105351b28912768a29f7952bfd75e9b2d3fcd8e6ae758b3bab8b986bf8e1300c256 WHIRLPOOL cc95728b07e384ee88002afce4b68abcfb259a62188cc77bad1154a83bf3e1979fec8761fe8a3c9e5ae35d5027cdf42c1b4a4b7749ad76d7935e032e253c8167
diff --git a/dev-python/apsw/apsw-3.8.7.1_p1.ebuild b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
new file mode 100644
index 000000000000..0b997ac83429
--- /dev/null
+++ b/dev-python/apsw/apsw-3.8.7.1_p1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.8.7.1_p1.ebuild,v 1.1 2014/11/06 06:16:31 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+MY_PV=${PV/_p/-r}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="http://code.google.com/p/apsw/"
+HOMEPAGE="https://github.com/rogerbinns/apsw/"
+SRC_URI="https://github.com/rogerbinns/apsw/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-db/sqlite-${PV%_p*}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-3.6.20.1-fix_tests.patch )
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile --enable=load_extension
+}
+
+src_test() {
+	# tests use overlapping database files
+	local DISTUTILS_NO_PARALLEL_BUILD=1
+	distutils-r1_src_test
+}
+
+python_test() {
+	"${PYTHON}" setup.py build_test_extension || die "Building of test loadable extension failed"
+	"${PYTHON}" tests.py -v || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use doc ; then
+		dohtml -r doc/*
+	fi
+}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 44aba2e301a9..48b5f7ebb7eb 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1 +1,2 @@
+DIST irc-10.0.zip 119198 SHA256 c6e7fa2eebe1b641bfeff5eb1c45e86071dad6557a760fb1a1635e5c88965647 SHA512 45c5fa43115dc9a9747b71c81a0bb94f3fd3bbdc1be68c82b66c8dafa556e081b5affc3a1ddd13eb76dc9143d4157cb4d73e307863768efab226eedc870219dd WHIRLPOOL 077c7212fcb4d5b2a9116019097f859444477cea63a9d425648df5ae84eaafaad77cf146c7953f29e35adf49d5d98b76fda7433cc5045e2f5f92c75007c61466
 DIST irc-8.9.1.zip 119769 SHA256 86f788293b2d924e1b71564a528f8e850135a271dcc45827577920188d4e5afc SHA512 0eae42a45b3b2e35b5a4da0d15f1e142ad28a0dadbfcb8d44efbc93648aaeda91019e084e8dba6d660c834e9bdcf0724a86a49194360ba5ab825573ea8ebc9cb WHIRLPOOL 05bf070a4103d6b33ae179d9be20733a633bf3f5caec363fd7cac05faee18465fd9adaeb6f1106747520c38bc2b31ca9c91b5b548878a4262a91d5765f9ff5e3
diff --git a/dev-python/irc/files/irc-8.5.1-setup_requires.patch b/dev-python/irc/files/irc-8.5.1-setup_requires.patch
index 732146c33741..f07e034ae035 100644
--- a/dev-python/irc/files/irc-8.5.1-setup_requires.patch
+++ b/dev-python/irc/files/irc-8.5.1-setup_requires.patch
@@ -1,13 +1,13 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -34,10 +33,6 @@
-     install_requires=[
-         'six',
-     ] + importlib_req + argparse_req,
--    setup_requires=[
--        'hgtools',
--        'pytest-runner',
--    ],
-     tests_require=[
-         'pytest',
-         'mock',
+@@ -35,10 +35,6 @@
+     install_requires=[
+         'six',
+     ] + importlib_req + argparse_req,
+-    setup_requires=[
+-        'hgtools',
+-        'pytest-runner',
+-    ],
+     tests_require=[
+         'pytest',
+         'mock',
diff --git a/dev-python/irc/irc-10.0.ebuild b/dev-python/irc/irc-10.0.ebuild
new file mode 100644
index 000000000000..f13491ba1e55
--- /dev/null
+++ b/dev-python/irc/irc-10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irc/irc-10.0.ebuild,v 1.1 2014/11/06 08:51:53 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://bitbucket.org/jaraco/irc http://pypi.python.org/pypi/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="
+	!>=dev-python/python-irclib-3.2.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jaraco-utils[${PYTHON_USEDEP}]"
+
+DEPEND="app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/hgtools-5[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+# A doc folder is present however it has no makefile; will require a manual rst or epydoc build
+python_test() {
+	# https://bitbucket.org/jaraco/irc/issue/47/testchanneltest_has_user-fails-in-release
+	py.test irc/tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && local EXAMPLES=( scripts/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild b/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
index 0f838b84280b..34d7e240b150 100644
--- a/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
+++ b/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild,v 1.4 2014/03/31 20:33:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest-runner/pytest-runner-1.1-r1.ebuild,v 1.5 2014/11/06 08:25:52 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 92689d910c34..302818c0583c 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -8,3 +8,4 @@ DIST pytz-2014.2.tar.bz2 160142 SHA256 4a752e3593827e935ffd3ffff68314da38d724f01
 DIST pytz-2014.3.tar.bz2 158565 SHA256 2aec76ecb31f3f3aaf3608afa87d14b536e56071f53fa40454c82d0916d91cee SHA512 beb50000571fc9f7ed7060ea8606e690604aaa44bca255699da7a545257603925877fcf5a9867650333cd4d84ea26f0498f326746bc5665fe8b2dc346073b1f6 WHIRLPOOL 577cca995ddb42cdf9d387306fd7c4dd07ab7029e4ab8ddcb67f855edc17f33d279342abbd0174230a6d93677f3d59b5cce4d93ad87d645f75074b7c686abbc5
 DIST pytz-2014.4.tar.bz2 159160 SHA256 a339a5ba846985bcf0a87782492458752b5d95b56ba219de4c9404c0ee5beec9 SHA512 6a6daa905405821b46f330df8cdb87ee2e04e29ea6eb607bf81b0c2ae668abd41e0390494c135865cd2d8b1301051126a29242088d82933dbbaee37f409a500f WHIRLPOOL 41dbc266f68db76f3e4e9f03c260adcf1ffd6bba6b313ec9cb5ef741a29a748ac2ae34cfc9470a2618b6cfd863f85a0fe766daa17f93619d098c879c869c4f61
 DIST pytz-2014.7.tar.bz2 166099 SHA256 56dec1e94d2fad13d9009a140b816808086a79ddf7edf9eb4931c84f65abb12a SHA512 98d3b0d6b3efd1f27560b55204beda4d897df3f499a23eb396f4e2abd64dd94326becc7f3ccedbad445bd7575f40ebf9023072b9a9a281dd64e8dce2c87ff886 WHIRLPOOL 55fa418b9a9563d45dc75ae8ae036f216394462f1dda5d64b13b8dbc6666a9856407f4f8832cce251245305bbb5a47298f1352fc95b0baacac1649f5c4a2faea
+DIST pytz-2014.9.tar.bz2 166230 SHA256 4ba0ab74fa7f34f77ff236ee2157454d1c2aaeaaa25932363bfa1be6cb82dbd6 SHA512 4034a33489be3059530d8ddbbba283da117b692a7ca2975835e5626d1c79be7317bade911b52f981b1bd94ec3ea15b0db1bb4adb4c3810af7ad66e15dec1313d WHIRLPOOL b0af01986dee4a1beeb957fb662f9ece373d3d0d033c3c2a78ec49b01e2d05aa596110460231913a8d6b2a3496a90be98041bc2fa7ce6ded32cf7c62340f0783
diff --git a/dev-python/pytz/pytz-2014.9.ebuild b/dev-python/pytz/pytz-2014.9.ebuild
new file mode 100644
index 000000000000..a601f6600482
--- /dev/null
+++ b/dev-python/pytz/pytz-2014.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.9.ebuild,v 1.1 2014/11/06 06:03:27 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+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"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=sys-libs/timezone-data-2014i"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Use timezone-data zoneinfo.
+	"${FILESDIR}/${PN}-2009j-zoneinfo.patch"
+	# ...and do not install a copy of it.
+	"${FILESDIR}/${PN}-2009h-zoneinfo-noinstall.patch"
+)
+
+python_test() {
+	"${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 25fe95e03d4d..fef970281308 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,2 +1,3 @@
 DIST mail-2.5.4-git.tar.gz 833881 SHA256 d618fab11e0f4d308535a21bd6c59c2ab81a4ac864db830cc1817ad131512bb9 SHA512 5e042b9bff41e75af76b7d21275488f79b4c5e1821827b114bfc0d09b12b8c487189e4732e58a642621609fad48af381ae7cd5507f4fc5cb620f54a2288a6dda WHIRLPOOL 5013a057fd1cadd2f3ef5b1c4f8c62e476f36309ca6de935041b03986525a42969d4a7d57907eba4c6a5622d96cca269c3dfc37c14e1a45e4167a9b3d9d6ab50
 DIST mail-2.6.1-git.tar.gz 936461 SHA256 8b1a6734b795d1a88255ac50d3a4949482520a0d17a270b2cbe155160abdf3e4 SHA512 0136023d706843c7e9f61c212d2c21007c8eab087f5d3e2f110a83933c37dc9d97597ae46839293f5e4a8250026ebfbea1a3862a8ccf07d6ef07a9f277275b38 WHIRLPOOL 47281361ca83d896ed98af81b991108127104cbd9ed1881663f2b7db0b459587ee2cf3b48798d6a8b22174ab119afa54962a05b58a8d59e8eeb90669a397addd
+DIST mail-2.6.2-git.tar.gz 938380 SHA256 c1534307420972972803c3d37691df03e782da19e04efd5d7f20f142d3969d15 SHA512 db1febd70e94b0dc8e0b2a28eebe377163bcdbd0143880ae3e25d569e295b468344fcd65b1f892c6e3a70f48edf0a2ec78fb8d807712ba0354b7c1a5ace2cded WHIRLPOOL 1a16e4bde47fbf56efde4858c965490b3acca3d09519cb0e09f52b56a600442b77a79072bb62e61546a77a8c9faf9e7b86e35a07771818caab14e38ad51e7def
diff --git a/dev-ruby/mail/mail-2.6.2.ebuild b/dev-ruby/mail/mail-2.6.2.ebuild
new file mode 100644
index 000000000000..14d9af6a9743
--- /dev/null
+++ b/dev-ruby/mail/mail-2.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mail/mail-2.6.2.ebuild,v 1.1 2014/11/06 07:02:28 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md ROADMAP TODO.rdoc"
+
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem versionator
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/mime-types-1.16 <dev-ruby/mime-types-3"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-tex/tth/tth-3.77.ebuild b/dev-tex/tth/tth-3.77.ebuild
index 1266545c18e9..365578a9b5f6 100644
--- a/dev-tex/tth/tth-3.77.ebuild
+++ b/dev-tex/tth/tth-3.77.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/tth/tth-3.77.ebuild,v 1.15 2014/03/06 15:49:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/tth/tth-3.77.ebuild,v 1.16 2014/11/06 10:58:50 jer Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 SLOT="0"
 LICENSE="free-noncomm"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
index 4a7cc38ed468..456d3c67da95 100644
--- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v 1.3 2014/11/05 15:17:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-6.5.14.ebuild,v 1.4 2014/11/06 08:15:19 jlec Exp $
 
 EAPI=5
 
@@ -69,8 +69,7 @@ src_install() {
 		dohtml -r doc/html/*
 	fi
 
-	[[ -e doc/man/man3/deprecated.3 ]] &&
-		mv doc/man/man3/{,cuda-}deprecated.3 || die
+	[[ -d doc ]] &&	mv doc/man/man3/{,cuda-}deprecated.3 || die
 	doman doc/man/man*/*
 
 	use debugger || remove+=" bin/cuda-gdb extras/Debugger"
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
index 005a169f45cc..05892b8bd7f5 100644
--- a/games-arcade/emilia-pinball/Manifest
+++ b/games-arcade/emilia-pinball/Manifest
@@ -1 +1 @@
-DIST pinball-0.3.1.tar.gz 6082982 SHA256 ba47989f7fb6e294faa95285563220c8b01c3dbb9aa1bc29828eb7e832855cb8
+DIST pinball-0.3.1.tar.gz 6082982 SHA256 ba47989f7fb6e294faa95285563220c8b01c3dbb9aa1bc29828eb7e832855cb8 SHA512 d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498 WHIRLPOOL 1a0e0a5aa3e890a5f05e106fe53af67eb2692c7ad4e84f8eeb6ae97d014444616a7cdbb3d5ff4ac34671a307bbef01de215dba2f104d1e2c9a2eb9101efd0c59
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
index a15b308c9774..c76f139687b6 100644
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild,v 1.8 2012/12/18 19:59:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild,v 1.9 2014/11/06 05:54:05 vapier Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -16,12 +16,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
 IUSE=""
 
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="virtual/opengl
 	x11-libs/libSM
 	media-libs/libsdl[joystick,opengl,video,X]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]
-	>=sys-devel/libtool-2.2.6b"
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 
diff --git a/games-strategy/freeciv/freeciv-2.4.3.ebuild b/games-strategy/freeciv/freeciv-2.4.3.ebuild
index 9ae8f1a844b3..e0702986488a 100644
--- a/games-strategy/freeciv/freeciv-2.4.3.ebuild
+++ b/games-strategy/freeciv/freeciv-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.3.ebuild,v 1.2 2014/11/03 12:45:42 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freeciv/freeciv-2.4.3.ebuild,v 1.3 2014/11/06 05:54:09 vapier Exp $
 
 # FIXME: gtk3 support breaks ggz support
 
@@ -28,7 +28,7 @@ RDEPEND="app-arch/bzip2
 		!mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) )
 	)
 	readline? ( sys-libs/readline:0 )
-	dedicated? ( aimodules? ( sys-devel/libtool:2 ) )
+	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
 	!dedicated? (
 		media-libs/libpng:0
 		ggz? ( games-board/ggz-gtk-client )
diff --git a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
index b61338aad69a..b68594307b03 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild,v 1.2 2014/05/15 17:05:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.2.3551.ebuild,v 1.3 2014/11/06 05:55:34 vapier Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-ttf
 	net-misc/curl
-	sys-devel/libtool:2
+	dev-libs/libltdl:0
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
index 9365fdf67765..33ade918ca23 100644
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
+++ b/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.5 2014/10/10 15:24:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar6/liquidwar6-0.4.3681.ebuild,v 1.6 2014/11/06 05:55:34 vapier Exp $
 
 EAPI=5
 
@@ -20,6 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
 
 # yes, cunit is rdep
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-scheme/guile
@@ -30,7 +31,7 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-ttf
 	net-misc/curl
-	sys-devel/libtool:2
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	sys-libs/zlib
 	virtual/glu
 	virtual/jpeg
diff --git a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
index 3c5d06bbb745..08cf95afed17 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.7 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.8.10-r1.ebuild,v 1.8 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
index 0934a0f0383e..445f09a8d2cc 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.4 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.7.ebuild,v 1.5 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
index b35121a34f1e..4c40fb2e8e35 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.2 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.8.ebuild,v 1.3 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,7 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+RDEPEND="dev-libs/libltdl:0
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
index 7ea6d237965c..174f39564c4c 100644
--- a/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.9 2014/11/05 16:22:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.8.9.9.ebuild,v 1.10 2014/11/06 05:41:10 vapier Exp $
 
 EAPI=5
 inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
@@ -18,7 +18,8 @@ IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig
 
 RESTRICT="perl? ( userpriv )"
 
-RDEPEND="dev-libs/libltdl
+# Drop the libtool dep once libltdl goes stable.
+RDEPEND="|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
 	bzip2? ( app-arch/bzip2 )
 	corefonts? ( media-fonts/corefonts )
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 90e4df0f4f77..02d3c9571e31 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Nov 2014 05:37:04 +0000
+Thu, 06 Nov 2014 11:07:02 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 90e4df0f4f77..02d3c9571e31 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Nov 2014 05:37:04 +0000
+Thu, 06 Nov 2014 11:07:02 +0000
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
new file mode 100644
index 000000000000..1a66c70e8689
--- /dev/null
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DEPEND=sys-libs/ncurses !app-admin/procinfo virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
+EAPI=5
+HOMEPAGE=http://sourceforge.net/projects/procinfo-ng/
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=|| ( GPL-2 LGPL-2.1 )
+RDEPEND=sys-libs/ncurses !app-admin/procinfo
+SLOT=0
+SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=20f41daeb7524457111781e2752eae47
diff --git a/metadata/md5-cache/app-admin/pwgen-2.07 b/metadata/md5-cache/app-admin/pwgen-2.07
index 77585e5d2fc5..2fa9573dcc98 100644
--- a/metadata/md5-cache/app-admin/pwgen-2.07
+++ b/metadata/md5-cache/app-admin/pwgen-2.07
@@ -3,9 +3,9 @@ DESCRIPTION=Password Generator
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pwgen/
 IUSE=livecd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/pwgen/pwgen-2.07.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=754045f88e4941fd10b2a5b64db14eb4
+_md5_=1eebc7bdd323dd7a5937f6e4a1933bf4
diff --git a/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1 b/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
index 0cc073730622..40477b97c275 100644
--- a/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
+++ b/metadata/md5-cache/dev-db/mysql-init-scripts-2.0-r1
@@ -3,9 +3,9 @@ DEPEND=virtual/pkgconfig
 DESCRIPTION=Gentoo MySQL init scripts
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!<dev-db/mysql-5.1
 SLOT=0
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3a6c5497d7f76bde068ca5de94ae5ffc
+_md5_=251b42ea07cd743634352e70f2365015
diff --git a/metadata/md5-cache/dev-libs/libp11-0.2.8 b/metadata/md5-cache/dev-libs/libp11-0.2.8
index 39bcf580a6da..079a8852bcb9 100644
--- a/metadata/md5-cache/dev-libs/libp11-0.2.8
+++ b/metadata/md5-cache/dev-libs/libp11-0.2.8
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/openssl dev-libs/libltdl virtual/pkgconfig doc? ( app-doc/doxygen )
+DEPEND=dev-libs/openssl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) virtual/pkgconfig doc? ( app-doc/doxygen )
 DESCRIPTION=A library implementing a layer on top of PKCS#11 API to make using PKCS#11 implementations easier
 EAPI=4
 HOMEPAGE=https://github.com/opensc/libp11/wiki
 IUSE=doc
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl dev-libs/libltdl
+RDEPEND=dev-libs/openssl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 SLOT=0
 SRC_URI=mirror://sourceforge/opensc/libp11/libp11-0.2.8.tar.gz
 _eclasses_=libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=7e6bc402cd05b09cb7de01a7601e02fe
+_md5_=5eff3959ba1226075ed87df793b36d6a
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r3 b/metadata/md5-cache/dev-libs/openct-0.6.20-r3
index 5c66b72d5e94..6212f17402d3 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r3
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) sys-devel/libtool doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=library for accessing smart card terminals
 EAPI=5
 HOMEPAGE=https://github.com/OpenSC/openct/wiki
 IUSE=doc pcsc-lite usb debug +udev
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) sys-devel/libtool udev? ( virtual/udev ) sys-apps/openrc
+RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) udev? ( virtual/udev ) sys-apps/openrc
 SLOT=0
 SRC_URI=sourceforge://opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=5a87c7a122f5894936dd191cf7065d58
+_md5_=6cfe08aad78b71a081717f7db6379f53
diff --git a/metadata/md5-cache/dev-libs/openct-0.6.20-r4 b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
index ac36e4694963..714c9dd7fc84 100644
--- a/metadata/md5-cache/dev-libs/openct-0.6.20-r4
+++ b/metadata/md5-cache/dev-libs/openct-0.6.20-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst setup
-DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) dev-libs/libltdl doc? ( app-doc/doxygen ) virtual/pkgconfig
+DEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) doc? ( app-doc/doxygen ) virtual/pkgconfig
 DESCRIPTION=library for accessing smart card terminals
 EAPI=5
 HOMEPAGE=https://github.com/OpenSC/openct/wiki
 IUSE=doc pcsc-lite usb debug +udev
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) dev-libs/libltdl udev? ( virtual/udev ) sys-apps/openrc
+RDEPEND=pcsc-lite? ( >=sys-apps/pcsc-lite-1.7.2-r1 ) usb? ( virtual/libusb:0 ) || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) udev? ( virtual/udev ) sys-apps/openrc
 SLOT=0
 SRC_URI=sourceforge://opensc/openct/openct-0.6.20.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f297f1db3bb5cb0c8a2f0b5d014cf13a
+_md5_=22ec1a92b16a7a4a8b149b60e0a9e7eb
diff --git a/metadata/md5-cache/dev-libs/opensc-0.12.2-r2 b/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
index 84c982a1724c..a2f41760e571 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.12.2-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=libtool? ( dev-libs/libltdl ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=libtool? ( || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) virtual/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Libraries and applications to access smartcards
 EAPI=4
 HOMEPAGE=http://www.opensc-project.org/opensc/
 IUSE=doc libtool +pcsc-lite openct readline ssl zlib
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2.1
-RDEPEND=libtool? ( dev-libs/libltdl ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+RDEPEND=libtool? ( || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) ssl? ( dev-libs/openssl ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 REQUIRED_USE=pcsc-lite? ( !openct ) openct? ( !pcsc-lite )
 SLOT=0
 SRC_URI=http://www.opensc-project.org/files/opensc/opensc-0.12.2.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=3aa669b86c005a1a499ccfd123ee14f2
+_md5_=4b43563d639942f772c6c6d61e5cf4e9
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.15 b/metadata/md5-cache/dev-libs/redland-1.0.15
index ad56878bb3fe..61b334626aaa 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.15
+++ b/metadata/md5-cache/dev-libs/redland-1.0.15
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) ssl? ( dev-libs/openssl:0 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
+DEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) ssl? ( dev-libs/openssl:0 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
 DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=4
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite ssl static-libs +xml
 KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) ssl? ( dev-libs/openssl:0 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+RDEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) ssl? ( dev-libs/openssl:0 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.15.tar.gz
 _eclasses_=libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=2f84104e3a12ba8775fa26f48e662f97
+_md5_=ee197decb97ac8d07a6d40cb9cbfc6a1
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.16 b/metadata/md5-cache/dev-libs/redland-1.0.16
index 79eee94b634e..141f81c28072 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.16
+++ b/metadata/md5-cache/dev-libs/redland-1.0.16
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
+DEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
 DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=4
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs +xml
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+RDEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) xml? ( dev-libs/libxml2 ) !xml? ( >=dev-libs/expat-2 ) >=media-libs/raptor-2.0.7 >=dev-libs/rasqal-0.9.28 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.16.tar.gz
 _eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=33158f05c618640d4a62d0d443b105ab
+_md5_=903e75e26e3f3496daa279f9db40db39
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17 b/metadata/md5-cache/dev-libs/redland-1.0.17
index d0e2b25bbbd6..7ebbb1b46131 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
+DEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
 DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=5
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+RDEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
 _eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=df9b3b13c8670d4f5bd4ac680019a486
+_md5_=d7f6e5b842b5647c90f9c3ccd47a88f4
diff --git a/metadata/md5-cache/dev-libs/redland-1.0.17-r1 b/metadata/md5-cache/dev-libs/redland-1.0.17-r1
index 92856ccef208..99a478512b97 100644
--- a/metadata/md5-cache/dev-libs/redland-1.0.17-r1
+++ b/metadata/md5-cache/dev-libs/redland-1.0.17-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
+DEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) virtual/pkgconfig
 DESCRIPTION=High-level interface for the Resource Description Framework
 EAPI=5
 HOMEPAGE=http://librdf.org/
 IUSE=berkdb iodbc mysql odbc postgres sqlite static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos
 LICENSE=Apache-2.0 GPL-2 LGPL-2.1
-RDEPEND=dev-libs/libltdl mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
+RDEPEND=dev-libs/libltdl:0 mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) berkdb? ( sys-libs/db ) >=media-libs/raptor-2.0.14 >=dev-libs/rasqal-0.9.32 postgres? ( virtual/postgresql ) iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 SLOT=0
 SRC_URI=http://download.librdf.org/source/redland-1.0.17.tar.gz
 _eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	c91a1ac3fefc6b077094fb2e82c65af4	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=94299fcbcdabb01cb517955a15dbb999
+_md5_=a938d0f820d7fd8376081a9f6b5ad004
diff --git a/metadata/md5-cache/dev-python/apsw-3.8.7.1_p1 b/metadata/md5-cache/dev-python/apsw-3.8.7.1_p1
new file mode 100644
index 000000000000..53287d8ced38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apsw-3.8.7.1_p1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-db/sqlite-3.8.7.1 app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=APSW - Another Python SQLite Wrapper
+EAPI=5
+HOMEPAGE=https://github.com/rogerbinns/apsw/
+IUSE=doc python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=dev-db/sqlite-3.8.7.1 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/rogerbinns/apsw/archive/3.8.7.1-r1.tar.gz -> apsw-3.8.7.1_p1.tar.gz
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3d1dec48611d37426abc9ccdc84ab7	python-utils-r1	38b54b08ee43ba478e97f7c89066eed5	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=ae7b3ef87b9e7e9991214c1f0210f937
diff --git a/metadata/md5-cache/dev-python/irc-10.0 b/metadata/md5-cache/dev-python/irc-10.0
new file mode 100644
index 000000000000..a9605754523d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/irc-10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/unzip dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] >=dev-python/hgtools-5[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] test? ( !>=dev-python/python-irclib-3.2.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jaraco-utils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=IRC client framework written in Python
+EAPI=5
+HOMEPAGE=https://bitbucket.org/jaraco/irc http://pypi.python.org/pypi/irc
+IUSE=examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=!>=dev-python/python-irclib-3.2.2[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/jaraco-utils[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/i/irc/irc-10.0.zip
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3d1dec48611d37426abc9ccdc84ab7	python-utils-r1	38b54b08ee43ba478e97f7c89066eed5	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=cb143dd9c64f2b998f3df1d3878ad99f
diff --git a/metadata/md5-cache/dev-python/pytest-runner-1.1-r1 b/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
index 2e4f0418defd..9a3785dec9d3 100644
--- a/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-runner-1.1-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/hgtools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
+DEPEND=dev-python/hgtools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
 DESCRIPTION=Adds support for tests durring installation of setup.py files
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pytest-runner
-IUSE=python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_pypy )
+RDEPEND=dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-runner/pytest-runner-1.1.zip
 _eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3d1dec48611d37426abc9ccdc84ab7	python-utils-r1	38b54b08ee43ba478e97f7c89066eed5	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=43026c873feea1358e8e7069b040eaad
+_md5_=94f58a45acccb91396a37169f85e7d85
diff --git a/metadata/md5-cache/dev-python/pytz-2014.9 b/metadata/md5-cache/dev-python/pytz-2014.9
new file mode 100644
index 000000000000..6ddaab533e4e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytz-2014.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=sys-libs/timezone-data-2014i python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=World timezone definitions for Python
+EAPI=5
+HOMEPAGE=http://pythonhosted.org/pytz/
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+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=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] >=sys-libs/timezone-data-2014i python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytz/pytz-2014.9.tar.bz2
+_eclasses_=distutils-r1	90e7008a7d21e3b1597bea444bb85827	eutils	c91a1ac3fefc6b077094fb2e82c65af4	multibuild	ddc59d206214ef1c240093e1bb2513cf	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3d1dec48611d37426abc9ccdc84ab7	python-utils-r1	38b54b08ee43ba478e97f7c89066eed5	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
+_md5_=618113c7778deb75bb09ab734eca7577
diff --git a/metadata/md5-cache/dev-ruby/mail-2.6.2 b/metadata/md5-cache/dev-ruby/mail-2.6.2
new file mode 100644
index 000000000000..6a4f9b35eef6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mail-2.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <dev-ruby/mime-types-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] <dev-ruby/mime-types-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] <dev-ruby/mime-types-3[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DESCRIPTION=An email handling library
+EAPI=5
+HOMEPAGE=https://github.com/mikel/mail
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby19] <dev-ruby/mime-types-3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] <dev-ruby/mime-types-3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] <dev-ruby/mime-types-3[ruby_targets_ruby21] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+SLOT=2.6
+SRC_URI=https://github.com/mikel/mail/archive/2.6.2.tar.gz -> mail-2.6.2-git.tar.gz
+_eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	ruby-fakegem	738ee4b7f8b16d4a734b4d37717db89b	ruby-ng	14f0490e24cbad7c17cece628b3d111e	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1e768bd6b67d15e2ade3d3cab7938c09
diff --git a/metadata/md5-cache/dev-tex/tth-3.77 b/metadata/md5-cache/dev-tex/tth-3.77
index 6a72ea6bf745..a3ab5c526d10 100644
--- a/metadata/md5-cache/dev-tex/tth-3.77
+++ b/metadata/md5-cache/dev-tex/tth-3.77
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Translate TEX into HTML
 EAPI=4
 HOMEPAGE=http://hutchinson.belmont.ma.us/tth/
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 x86
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86
 LICENSE=free-noncomm
 RDEPEND=app-text/ghostscript-gpl media-libs/netpbm
 SLOT=0
 SRC_URI=mirror://gentoo/tth-3.77.tgz
 _eclasses_=multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=52b96919d02b938ecea635eca2da15f9
+_md5_=70def81a8850fb8eeaab9aaf201182ea
diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
index 91173e002ce1..6c58a6cf6588 100644
--- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
+++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-6.5.14
@@ -9,4 +9,4 @@ RDEPEND=<sys-devel/gcc-4.9[cxx] >=x11-drivers/nvidia-drivers-340.32[uvm] debugge
 SLOT=0/6.5.14
 SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_64.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.14_linux_32.run )
 _eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cuda	4a1af424313a3b30f00f3c918de4f772	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2b988643ed32ff1d0e96493ea8bcf6e6
+_md5_=f41f7c0006776b009348b1bf8c2718ae
diff --git a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1 b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
index f540df36b17d..ae9535c3db5d 100644
--- a/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
+++ b/metadata/md5-cache/games-arcade/emilia-pinball-0.3.1-r1
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b x11-libs/libXt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) x11-libs/libXt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=SDL OpenGL pinball game
 EAPI=2
 HOMEPAGE=http://pinball.sourceforge.net/
 KEYWORDS=amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b games-misc/games-envd
+RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=7bd782ae1ea13edb2f41f8c9ecc5f104
+_md5_=51c272e9e9c3b22f7ce6531dd90555c8
diff --git a/metadata/md5-cache/games-strategy/freeciv-2.4.3 b/metadata/md5-cache/games-strategy/freeciv-2.4.3
index 92735d36570b..2480dc273536 100644
--- a/metadata/md5-cache/games-strategy/freeciv-2.4.3
+++ b/metadata/md5-cache/games-strategy/freeciv-2.4.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-lang/lua net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) postgres? ( virtual/postgresql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0 ) dedicated? ( aimodules? ( sys-devel/libtool:2 ) ) !dedicated? ( media-libs/libpng:0 ggz? ( games-board/ggz-gtk-client ) gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/freetype:2 ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) virtual/pkgconfig !dedicated? ( x11-proto/xextproto nls? ( sys-devel/gettext ) ) >=sys-apps/sed-4
+DEPEND=app-arch/bzip2 app-arch/xz-utils dev-lang/lua net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) postgres? ( virtual/postgresql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0 ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 ggz? ( games-board/ggz-gtk-client ) gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/freetype:2 ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) virtual/pkgconfig !dedicated? ( x11-proto/xextproto nls? ( sys-devel/gettext ) ) >=sys-apps/sed-4
 DESCRIPTION=multiplayer strategy game (Civilization Clone)
 EAPI=5
 HOMEPAGE=http://www.freeciv.org/
 IUSE=auth aimodules dedicated ggz +gtk ipv6 mapimg modpack mysql nls postgres readline sdl +server +sound sqlite
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-lang/lua net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) postgres? ( virtual/postgresql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0 ) dedicated? ( aimodules? ( sys-devel/libtool:2 ) ) !dedicated? ( media-libs/libpng:0 ggz? ( games-board/ggz-gtk-client ) gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/freetype:2 ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) games-misc/games-envd
+RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-lang/lua net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) postgres? ( virtual/postgresql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( !postgres? ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0 ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 ggz? ( games-board/ggz-gtk-client ) gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/freetype:2 ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/freeciv/freeciv-2.4.3.tar.bz2
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	games	e221fed675714bd5545b7488aed9f822	games-ggz	7957d0a0b68d2703b8bb71ec7ddd87a8	gnome2-utils	f658eba3cc594a21cf6eef4af47daa90	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=9f2aa94d26e1e3b62a7cbca9c1e2da2f
+_md5_=01adfeabef095d8b1918a5297ab52433
diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551 b/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551
index 15f4e16da2d2..b1cb5757d2e4 100644
--- a/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551
+++ b/metadata/md5-cache/games-strategy/liquidwar6-0.2.3551
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-devel/libtool:2 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Unique multiplayer wargame between liquids
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/liquidwar6/
 IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-devel/libtool:2 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl dev-libs/libltdl:0 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.2.3551/liquidwar6-0.2.3551.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.2.3551/liquidwar6-extra-maps-0.2.3551.tar.gz )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e0939f417b21dd7b01ff9c859a5b75a4
+_md5_=0f382e18c3324dbf347b393288f93d76
diff --git a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681 b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
index f8931f8e3b5d..220fa4af30e6 100644
--- a/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
+++ b/metadata/md5-cache/games-strategy/liquidwar6-0.4.3681
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-devel/libtool:2 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) dev-lang/perl nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.14:1.14 ) >=sys-devel/autoconf-2.69 sys-devel/libtool
 DESCRIPTION=Unique multiplayer wargame between liquids
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/liquidwar6/
 IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl sys-devel/libtool:2 sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses sys-libs/readline ) games-misc/games-envd
 SLOT=0
 SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	c91a1ac3fefc6b077094fb2e82c65af4	games	e221fed675714bd5545b7488aed9f822	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ac18c4d5c9df684413f27ff36df72145
+_md5_=6a7c234188af8e46a290c8008c11c9f9
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.8.10-r1 b/metadata/md5-cache/media-gfx/imagemagick-6.8.8.10-r1
index b2949547ca2b..ccd02cb139ec 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.8.10-r1
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.8.10-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( <media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
+DEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( <media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
 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
 LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( <media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= )
+RDEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( <media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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 )
 RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.8.10
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.8-10.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e42452b537b6e6a1517849ce88d9665c
+_md5_=41ce57049753b4d4e9ae022ec4ccc16d
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.7 b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.7
index 4b62b86f7048..65318743339e 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.7
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.7
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
+DEPEND=dev-libs/libltdl:0 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
 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
 LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= )
+RDEPEND=dev-libs/libltdl:0 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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 )
 RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.9.7
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.9-7.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=069d0c233f50a72eb5a63e1534cf9024
+_md5_=a888e55a8be706a2c6a00805f3ee22b9
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.8 b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.8
index 90daae144d24..d690ea7c83a7 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.8
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.8
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
+DEPEND=dev-libs/libltdl:0 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
 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
 LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= )
+RDEPEND=dev-libs/libltdl:0 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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 )
 RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.9.8
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.9-8.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=cdb617515a116977438f07a7a45aca9b
+_md5_=39f3c57a1a592286c098d4cbb2dfbd92
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.9 b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.9
index 3a9042b3edfe..8e69abea5e32 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.8.9.9
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.8.9.9
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install prepare test
-DEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
+DEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= ) !media-gfx/graphicsmagick[imagemagick] virtual/pkgconfig X? ( x11-proto/xextproto )
 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
 LICENSE=imagemagick
-RDEPEND=dev-libs/libltdl 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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:= )
+RDEPEND=|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) 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-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) 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:0= ) 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 )
 RESTRICT=perl? ( userpriv )
 SLOT=0/6.8.9.9
 SRC_URI=mirror://imagemagick/ImageMagick-6.8.9-9.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a4320eca078ca757e8e93f3a9d67db47
+_md5_=66d0c5b973e0d1a8ef5292c123b7a63e
diff --git a/metadata/md5-cache/net-mail/mailutils-2.99.98 b/metadata/md5-cache/net-mail/mailutils-2.99.98
index e8a7e0c78cad..45166a010c2e 100644
--- a/metadata/md5-cache/net-mail/mailutils-2.99.98
+++ b/metadata/md5-cache/net-mail/mailutils-2.99.98
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline sys-devel/libtool virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( virtual/postgresql ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig python? ( =dev-lang/python-2* )
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( virtual/postgresql ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig python? ( =dev-lang/python-2* )
 DESCRIPTION=A useful collection of mail servers, clients, and filters
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/mailutils/mailutils.html
 IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet
 KEYWORDS=amd64 arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline sys-devel/libtool virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( virtual/postgresql ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) python? ( =dev-lang/python-2* )
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses sys-libs/readline || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) virtual/mta berkdb? ( sys-libs/db ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( virtual/postgresql ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://gnu-alpha/mailutils/mailutils-2.99.98.tar.xz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	python	be9965681d83c3980660a2660ac95e95	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=dab3285e0cb38c5e562e790df79c57ad
+_md5_=10ef44208aa8fe063ed2a7cd04dbaa41
diff --git a/metadata/md5-cache/sci-mathematics/octave-3.8.2 b/metadata/md5-cache/sci-mathematics/octave-3.8.2
index 1109ae28a87a..6a63087aa26a 100644
--- a/metadata/md5-cache/sci-mathematics/octave-3.8.2
+++ b/metadata/md5-cache/sci-mathematics/octave-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=High-level interactive language for numerical computations
 EAPI=5
 HOMEPAGE=http://www.octave.org/
 IUSE=curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib elibc_FreeBSD java
-KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:5= virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick:0=[cxx] media-gfx/imagemagick:0=[cxx] ) ) java? ( >=virtual/jre-1.6.0 ) jit? ( <sys-devel/llvm-3.5:0= ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl] x11-libs/gl2ps:0= virtual/glu ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) readline? ( sys-libs/readline:0= ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) zlib? ( sys-libs/zlib:0= ) virtual/fortran java? ( >=dev-java/java-config-2.1.9-r1 )
 SLOT=0/3.8.2
 SRC_URI=mirror://gnu/octave/octave-3.8.2.tar.bz2
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	f02d3e4777b404c719a5a6479c37c6e3	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=47015650761372901c1cdbae2feaa48e
+_md5_=a46d22a7d526d5fa5c5c564b75440eb7
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.10.0-r1 b/metadata/md5-cache/sys-apps/hwloc-1.10.0-r1
new file mode 100644
index 000000000000..c23198d19bab
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwloc-1.10.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) cuda? ( dev-util/nvidia-cuda-toolkit ) gl? ( media-video/nvidia-settings ) opencl? ( x11-drivers/ati-drivers ) pci? ( sys-apps/pciutils x11-libs/libpciaccess ) plugins? ( dev-libs/libltdl:0 ) numa? ( sys-process/numactl ) xml? ( dev-libs/libxml2 ) virtual/pkgconfig
+DESCRIPTION=displays the hardware topology in convenient formats
+EAPI=5
+HOMEPAGE=http://www.open-mpi.org/projects/hwloc/
+IUSE=cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses cairo? ( x11-libs/cairo[X?,svg?] ) cuda? ( dev-util/nvidia-cuda-toolkit ) gl? ( media-video/nvidia-settings ) opencl? ( x11-drivers/ati-drivers ) pci? ( sys-apps/pciutils x11-libs/libpciaccess ) plugins? ( dev-libs/libltdl:0 ) numa? ( sys-process/numactl ) xml? ( dev-libs/libxml2 )
+SLOT=0/5
+SRC_URI=http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.0.tar.bz2
+_eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	autotools-utils	3727db64c7b960903d5033280f108080	cuda	4a1af424313a3b30f00f3c918de4f772	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=17817718f7b31231229415efef9dfe4b
diff --git a/metadata/md5-cache/sys-auth/polkit-0.112-r2 b/metadata/md5-cache/sys-auth/polkit-0.112-r2
index 1239859ac340..40107eec6a53 100644
--- a/metadata/md5-cache/sys-auth/polkit-0.112-r2
+++ b/metadata/md5-cache/sys-auth/polkit-0.112-r2
@@ -11,4 +11,4 @@ RDEPEND=ia64? ( =dev-lang/spidermonkey-1.8.5*[-debug] ) hppa? ( =dev-lang/spider
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/polkit/releases/polkit-0.112.tar.gz
 _eclasses_=eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	pax-utils	dfe060cb70d89757fde5c1ff8405e950	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=0b2eb5984771756fa0a570d13b8fcea9
+_md5_=38ab2330c61bba5c99537015198cd13d
diff --git a/metadata/md5-cache/www-client/seamonkey-2.30-r1 b/metadata/md5-cache/www-client/seamonkey-2.30-r1
index a220b60ab178..48d22c287e30 100644
--- a/metadata/md5-cache/www-client/seamonkey-2.30-r1
+++ b/metadata/md5-cache/www-client/seamonkey-2.30-r1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/nss-3.17.1 >=dev-libs/nspr-4.10.6 crypt? ( || ( ( >=app-crypt
 SLOT=0
 SRC_URI=linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.be.langpack.xpi -> seamonkey-2.30-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.ca.langpack.xpi -> seamonkey-2.30-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.cs.langpack.xpi -> seamonkey-2.30-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.de.langpack.xpi -> seamonkey-2.30-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.en-GB.langpack.xpi -> seamonkey-2.30-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.es-AR.langpack.xpi -> seamonkey-2.30-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.es-ES.langpack.xpi -> seamonkey-2.30-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.fi.langpack.xpi -> seamonkey-2.30-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.fr.langpack.xpi -> seamonkey-2.30-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.gl.langpack.xpi -> seamonkey-2.30-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.hu.langpack.xpi -> seamonkey-2.30-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.it.langpack.xpi -> seamonkey-2.30-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.ja.langpack.xpi -> seamonkey-2.30-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.lt.langpack.xpi -> seamonkey-2.30-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.nb-NO.langpack.xpi -> seamonkey-2.30-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.nl.langpack.xpi -> seamonkey-2.30-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.pl.langpack.xpi -> seamonkey-2.30-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.pt-PT.langpack.xpi -> seamonkey-2.30-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.ru.langpack.xpi -> seamonkey-2.30-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.sk.langpack.xpi -> seamonkey-2.30-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.sv-SE.langpack.xpi -> seamonkey-2.30-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.tr.langpack.xpi -> seamonkey-2.30-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.uk.langpack.xpi -> seamonkey-2.30-uk.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.zh-CN.langpack.xpi -> seamonkey-2.30-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/langpack/seamonkey-2.30.zh-TW.langpack.xpi -> seamonkey-2.30-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.30/source/seamonkey-2.30.source.tar.bz2 -> seamonkey-2.30.source.tar.bz2 http://dev.gentoo.org/~axs/mozilla/patchsets/firefox-31.0-patches-0.2.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.30-patches-01.tar.xz crypt? ( http://www.enigmail.net/download/source/enigmail-1.7.2.tar.gz )
 _eclasses_=autotools	ebea507d219855923e3438c953cf4ab8	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	c91a1ac3fefc6b077094fb2e82c65af4	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	libtool	52d0e17251d04645ffaa61bfdd858944	mozconfig-v5.33	254a2d101581a02e3c3a0bc1d473e2cd	mozcoreconf-v3	30c3473da4c183894e9c355b1bc0a3d6	mozextension	ba6829881080a663d68531424a3dfbc6	mozlinguas	4fccc675305cf2d1e23c1a05f47b9b2a	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multiprocessing	d7f2985a2c76c365ee20269db5261414	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	4560effd96d3d2a82e50af7cf87166da	python-utils-r1	38b54b08ee43ba478e97f7c89066eed5	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b88300a8c3857a958e23730b28a4b108
+_md5_=d9cfd79cd8d6d29ede456107a9bf23b0
diff --git a/metadata/md5-cache/x11-libs/gl2ps-1.3.8 b/metadata/md5-cache/x11-libs/gl2ps-1.3.8
index ea6acbf58655..2c6790ff7717 100644
--- a/metadata/md5-cache/x11-libs/gl2ps-1.3.8
+++ b/metadata/md5-cache/x11-libs/gl2ps-1.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=OpenGL to PostScript printing library
 EAPI=4
 HOMEPAGE=http://www.geuz.org/gl2ps/
 IUSE=doc png zlib
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2
 RDEPEND=media-libs/freeglut x11-libs/libXmu png? ( media-libs/libpng ) zlib? ( sys-libs/zlib )
 SLOT=0
 SRC_URI=http://geuz.org/gl2ps/src/gl2ps-1.3.8.tgz
 _eclasses_=cmake-utils	e2cc76ea65ae78da8e4696dad93f5d29	eutils	c91a1ac3fefc6b077094fb2e82c65af4	flag-o-matic	eda1c0b5ba85b3eeb555a071d69eb819	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	0dfbfa13f57c6184f4728d12ac002aac
-_md5_=33cd3cfa0e2a5739db9680757de1a4c4
+_md5_=ccfa62be0adb919910e9edc559647e37
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bab96d5e1c75..9318ed9bf216 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Nov 2014 05:37:07 +0000
+Thu, 06 Nov 2014 11:07:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index bc876e892e1b..9e40f6d117d1 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Nov  6 05:37:04 UTC 2014
+Thu Nov  6 11:07:02 UTC 2014
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d1fb17ecdafb..eac2b0bba79a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Nov 2014 06:00:01 +0000
+Thu, 06 Nov 2014 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1febc2b37351..0b7985c83cce 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1415252101 Thu 06 Nov 2014 05:35:01 AM UTC UTC
+1415271901 Thu 06 Nov 2014 11:05:01 AM UTC UTC
diff --git a/net-mail/mailutils/mailutils-2.99.98.ebuild b/net-mail/mailutils/mailutils-2.99.98.ebuild
index e0b966aeb739..0ea4bd6b533e 100644
--- a/net-mail/mailutils/mailutils-2.99.98.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.98.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.98.ebuild,v 1.7 2014/11/03 13:44:32 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.98.ebuild,v 1.8 2014/11/06 05:51:45 vapier Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -11,20 +11,21 @@ DESCRIPTION="A useful collection of mail servers, clients, and filters"
 HOMEPAGE="http://www.gnu.org/software/mailutils/mailutils.html"
 #SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
 SRC_URI="mirror://gnu-alpha/mailutils/${P}.tar.xz"
+
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-
 KEYWORDS="amd64 arm64 ~hppa ~ppc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos ldap mysql nls pam postgres
 python servers ssl static-libs +threads tcpd tokyocabinet"
 
+# Drop the libtool dep once libltdl goes stable.
 RDEPEND="!mail-client/nmh
 	!mail-filter/libsieve
 	!mail-client/mailx
 	!mail-client/nail
 	sys-libs/ncurses
 	sys-libs/readline
-	sys-devel/libtool
+	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
 	virtual/mta
 	berkdb? ( sys-libs/db )
 	bidi? ( dev-libs/fribidi )
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index 800da13e6269..c5983762064e 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.3 2014/11/03 11:02:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-3.8.2.ebuild,v 1.4 2014/11/06 10:59:42 jer Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild b/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..3a6e35fec033
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwloc/hwloc-1.10.0-r1.ebuild,v 1.1 2014/11/06 05:48:50 vapier Exp $
+
+EAPI=5
+
+inherit flag-o-matic cuda autotools-utils multilib versionator
+
+MY_PV=v$(get_version_component_range 1-2)
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="http://www.open-mpi.org/projects/hwloc/"
+SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cairo cuda debug gl +numa opencl +pci plugins svg static-libs xml X"
+
+# TODO opencl only works with AMD so no virtual
+
+RDEPEND="sys-libs/ncurses
+	cairo? ( x11-libs/cairo[X?,svg?] )
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	gl? ( media-video/nvidia-settings )
+	opencl? ( x11-drivers/ati-drivers )
+	pci? (
+		sys-apps/pciutils
+		x11-libs/libpciaccess
+	)
+	plugins? ( dev-libs/libltdl:0 )
+	numa? ( sys-process/numactl )
+	xml? ( dev-libs/libxml2 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+AUTOTOOLS_AUTORECONF=1
+
+src_prepare() {
+	if use cuda ; then
+		append-cflags -I/opt/cuda/include
+		append-cppflags -I/opt/cuda/include
+		append-ldflags -L/opt/cuda/$(get_libdir)
+	fi
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
+	local myeconfargs=(
+		--disable-silent-rules
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cairo)
+		$(use_enable cuda)
+		$(use_enable debug)
+		$(use_enable gl)
+		$(use_enable opencl)
+		$(use_enable pci)
+		$(use_enable plugins)
+		$(use_enable numa libnuma)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+}
diff --git a/sys-auth/polkit/polkit-0.112-r2.ebuild b/sys-auth/polkit/polkit-0.112-r2.ebuild
index 344eac247518..d86ceac16c25 100644
--- a/sys-auth/polkit/polkit-0.112-r2.ebuild
+++ b/sys-auth/polkit/polkit-0.112-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.13 2014/11/04 09:22:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/polkit/polkit-0.112-r2.ebuild,v 1.14 2014/11/06 10:57:09 ssuominen Exp $
 
 EAPI=5
 inherit eutils multilib pam pax-utils systemd user
@@ -91,7 +91,7 @@ src_compile() {
 	use hppa && m='mr'
 	use ia64 && m='mr'
 	use mips && m='mr'
-	pax-mark ${m} ${f}
+	[ -n "$m" ] && pax-mark ${m} ${f}
 }
 
 src_install() {
diff --git a/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch b/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch
deleted file mode 100644
index d4fa60302d9c..000000000000
--- a/www-client/seamonkey/files/seamonkey-2.30-pulseaudio_configure_switch_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- comm-beta/mozilla/configure.in
-+++ comm-beta/mozilla/configure.in
-@@ -5489,17 +5489,6 @@
- dnl = Disable PulseAudio
- dnl ========================================================
- 
--dnl If using Linux, ensure that the PA library is available
--case "$OS_TARGET" in
--WINNT|Darwin|Android|OpenBSD)
--    ;;
--*)
--    if test -z "$MOZ_B2G"; then
--        MOZ_PULSEAUDIO=1
--    fi
--    ;;
--esac
--
- MOZ_ARG_DISABLE_BOOL(pulseaudio,
- [  --disable-pulseaudio          Disable PulseAudio support],
-    MOZ_PULSEAUDIO=,
diff --git a/www-client/seamonkey/seamonkey-2.30-r1.ebuild b/www-client/seamonkey/seamonkey-2.30-r1.ebuild
index a67a332b8beb..1399cb3f8d59 100644
--- a/www-client/seamonkey/seamonkey-2.30-r1.ebuild
+++ b/www-client/seamonkey/seamonkey-2.30-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30-r1.ebuild,v 1.1 2014/11/05 23:18:24 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.30-r1.ebuild,v 1.2 2014/11/06 07:51:42 polynomial-c Exp $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
@@ -120,8 +120,7 @@ src_prepare() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}/seamonkey"
 
-	epatch "${FILESDIR}"/${PN}-2.30-pulseaudio_configure_switch_fix.patch \
-		"${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch \
+	epatch"${FILESDIR}"/${PN}-2.30-jemalloc-configure.patch \
 		"${FILESDIR}"/${PN}-2.30-webm-disallow-negative-samples.patch
 
 	# browser patches go here
@@ -240,6 +239,8 @@ src_configure() {
 			append-flags -mno-avx
 		fi
 	fi
+
+	emake V=1 -f client.mk configure
 }
 
 src_compile() {
diff --git a/x11-libs/gl2ps/gl2ps-1.3.8.ebuild b/x11-libs/gl2ps/gl2ps-1.3.8.ebuild
index 15afd74f2d47..5aa6db0a5540 100644
--- a/x11-libs/gl2ps/gl2ps-1.3.8.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.8.ebuild,v 1.3 2014/03/06 15:50:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gl2ps/gl2ps-1.3.8.ebuild,v 1.4 2014/11/06 10:59:15 jer Exp $
 
 EAPI=4
 inherit cmake-utils multilib
@@ -11,7 +11,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc png zlib"
 
 RDEPEND="